diff --git a/INVARIANTS.md b/INVARIANTS.md
index 24adcd932c3..8ced06c4ab4 100644
--- a/INVARIANTS.md
+++ b/INVARIANTS.md
@@ -342,6 +342,7 @@ Per **Dispatch-Discipline Mechanisms (b)** above, each **new** path added to `EX
 | `src/v3/compiler/tests/integration/file_attachment_substrate_carrier_test.rs` | **R3 program plan:** `docs/r3-program-plan.md` §1.8 gate **#62** `substrate_gap_file_ingestion_closed` (T-Workflow-As-Data substrate-gap class; worker brief `docs/briefs/r3-substrate-gate-62-file-attachment-carrier-worker.md`). **Dissolution:** remove when a `.dag` `TestClaim` / PB-B-1 runner receipt can assert `FileAttachment` field names + cross-module nominal wiring against `generated_full_bootstrap_dag()` without this hand-Rust structural ratchet (same dissolution posture as `timing_lens_substrate_carrier_test.rs` for gate #55). **Interim ratchet:** `file_attachment_shape_locked` + `file_attachment_field_types_locked` + `file_attachment_field_count_is_five` pin the ratified Refined-B-1 five-field subset of `WorkflowObservationAnchor` (`NodeId`, `ContentHash`, `WorkflowProducerId`, `WorkflowRunId`, `Nanoseconds`) exactly as declared in `src/v3/std/timing_lens.dag`; existence proof carrier construction stays in-module as `gate_62_file_attachment_demo_record`. |
 | `src/v3/compiler/tests/integration/m2_substrate_inhabitance_test.rs` | **ROADMAP:** `ROADMAP.md` — **Tier-3 perf-budget Phase-1 hand-Rust mirror benches** / T-Tier3-Dissolution paired-dispatch (`docs/briefs/r3-pb-t-tier3-consumer-slice-worker.md`). **Plan:** `docs/r3-program-plan.md` §1.8 gate **#2** `tier3_computation_mirror_dissolved` (state-check; **CONSUMER_LANDED** = §1.7 executable-consumer sense, not INVARIANTS §P2 generated-consumer — see plan §1.7 “State-check …” paragraph). **Dissolution:** retire remaining Tier3 host mirrors per `docs/r3-structure.md` §Acceptance as Evaluator-backed std bodies land. **Interim ratchet (P5 Mechanism (b)):** `tier3_computation_mirror_trivial_constructors_dissolved` (PR #2789 narrow slice) + `tier3_computation_mirror_kernel_algebra_profile_substrate_authority` with brace-bounded `dag.rs` scan asserting `type_iteration_dimension` delegates through `BOOTSTRAPPED_DAG.kernel_algebra_profile` (forbid parallel hand-maintained type→profile tables); sibling Tier3 rows in this file carry the same lane receipts. |
 | `src/v3/compiler/tests/integration/r3_gate_60_phase2_width_nat_parser_test.rs` | **ROADMAP:** `ROADMAP.md` — **`substrate_gap_parser_grammar_closed`** / R3 gate **#60** (Phase 2.1 parser slice: angle-only width nat in `<…>`, `TypeAngleArg` substrate split, `Compose<Algebra, MachineWidth<N>>` lowering with literal phantom width). **Dissolution:** remove when gate #60 parse/lower/routing receipts are carried by `.dag` `TestClaim` / generated harness without this hand-authored `compile_to_dag` + `parse_for_test` module (per `docs/audit/r3-gate-60-decomposition.md` follow-on slices). **Interim ratchet:** `gate_60_phase2_parse_accepts_algebra_angle_width_nat`, `gate_60_phase2_int_64_lowers_to_compose_int_machine_width_literal`, `gate_60_phase2_nat_8_lowers_via_uint_slot`, `gate_60_integer_routing_witness_accepts_literal_nat_machine_width`, `gate_60_bare_numeric_type_is_parse_rejected`, `gate_60_int_disallowed_width_fails_closed_without_malformed_template_args`. |
+| `src/v3/compiler/tests/integration/t_gate_58_apply_lens_self_application_test.rs` | **ROADMAP:** `ROADMAP.md` → `### Nine lanes` → **T-PB-B** / `pb_rust_tests_outside_residual_zero`. **Plan:** `docs/r3-program-plan.md` §1.8 gate **#58** `apply_lens_self_application_demonstrated` — lane **T-Lens-Self-Application** (`EnforcedApplication<TimingMeasurement, TimingBudget, TimingEnforcementProjected>` bootstrap receipt over `gate_58_apply_lens_self_application_pass` + typed witness `gate_58_modeled_ci_timing_measurement` (`gate_58_ci_workflow_timing_row` with `workflow: modeled_gunbc_ci_workflow`) in `src/v3/std/t_ci_workflow_as_data_demo.dag`). **Dissolution:** remove when a `.dag` `TestClaim` / runner receipt asserts the same `generated_full_bootstrap_dag()` facts (empty bootstrap diagnostics + witness declarations) without this Rust harness. **Interim ratchet:** `apply_lens_self_application_demonstrated_bootstrap_receipt` + `gate_58_modeled_ci_timing_measurement` presence checks. **Co-receipt (same PR, P5 single surface):** expanded `src/v3/compiler/src/enforced_lens_application.rs` timing consumer + `src/v3/compiler/build.rs` default-rank std `STAGED_FILES` ordering from parsed `import v3.std.*` edges (Kahn topo among co-ranked files; single authority with module imports) are documented in `scripts/ci-merge/sg0-pr-body-append.2827.txt` (prepended to the PR body in CI) with explicit ROADMAP rows + dissolution triggers per INVARIANTS §P5 Mechanism **(b)**. |
 
 ### SG-0 hand-authored compiler non-test paths (`src/v3/compiler/src/`)
 
diff --git a/docs/design-lens-application-surface.md b/docs/design-lens-application-surface.md
index 7fe72555de1..4f97400d13b 100644
--- a/docs/design-lens-application-surface.md
+++ b/docs/design-lens-application-surface.md
@@ -2,7 +2,7 @@
 
 > Part of: [`docs/lens-library-design.md`](lens-library-design.md), [`docs/r3-structure.md`](r3-structure.md), [`docs/v3-lens-capability-register.md`](v3-lens-capability-register.md), [`../INVARIANTS.md`](../INVARIANTS.md)
 >
-> **Purpose:** specify the substrate shape and authoring surface for applying lenses to arbitrary `.dag` sections. This design extends [`docs/lens-library-design.md`](lens-library-design.md) §3 (file-glob `LensApplication`) to function / module / expression / declaration scope, and resolves the violation-policy semantics under fail-closed discipline (resolved as **two separate top-level carriers** — `EnforcedApplication<Output, Budget>` and `IntrospectApplication<Output>` — sidestepping per-variant generics that v3's `.dag` substrate cannot currently express; see §2 + §3).
+> **Purpose:** specify the substrate shape and authoring surface for applying lenses to arbitrary `.dag` sections. This design extends [`docs/lens-library-design.md`](lens-library-design.md) §3 (file-glob `LensApplication`) to function / module / expression / declaration scope, and resolves the violation-policy semantics under fail-closed discipline (resolved as **two separate top-level carriers** — `EnforcedApplication<Output, Budget, Projected>` and `IntrospectApplication<Output>` — sidestepping per-variant generics that v3's `.dag` substrate cannot currently express; see §2 + §3).
 >
 > **Authority discipline:** this is a R3 design doc; the implementation lane is **T-Lens-Application-Surface** (see [`docs/r3-structure.md`](r3-structure.md) lane table). This doc resolves the design questions that block lane dispatch.
 
@@ -65,64 +65,56 @@ type SectionRef
 
 type DiagnosticSeverity = Error                  // C-8 fail-closed: only Error is admitted
 
-// LensEnforcement<Output, Budget> is the per-lens projection AND
-// violation relation. Both are required for the fold-pass enforcement
-// check; the projection alone would leave "did the observed value
-// exceed the declared budget?" as API-level convention.
+// LensEnforcement<Output, Budget, Projected> binds three type parameters:
+// - `Output`: lens-output carrier (`Lens<Output>`).
+// - `Budget`: user-authored contract on `EnforcedApplication.budget`.
+// - `Projected`: codomain of `project` — the usage coordinate for compositional / diagnostic
+//   consumers. Many lenses set `Projected = Budget` (identity projection or a class-shaped
+//   projection isomorphic to the budget type). **Timing** uses a dedicated sum
+//   (`TimingEnforcementProjected` in `timing_lens.dag`) so non-evidence never inhabits `TimingBudget`
+//   on the projection path (P2 / gate #58).
 //
-// - project: extracts the budget-comparable coordinate from the lens
-//   output (identity for lenses where Output = Budget; e.g.,
-//   summary.asymptotic_class for complexity).
-// - violates: per-lens violation relation. Given the user's declared
-//   budget and the projected lens-output, returns true iff the projected
-//   value EXCEEDS the budget. Each lens's enforcement declares its own
-//   violation semantics structurally (lattice ordering for complexity;
-//   dominance for cost; mode-mismatch for parallelism).
-type LensEnforcement<Output, Budget> {
-  project: Output -> Budget
-  violates: (declared: Budget, observed: Budget) -> Bool
+// - `project`: extracts `Projected` from the lens output.
+// - `violates`: `(output: Output, declared: Budget) -> Bool`. The first argument is always the
+//   **full** lens output (not only `project(output)`); the second is the user-declared `Budget`.
+type LensEnforcement<Output, Budget, Projected> {
+  project: fn(Output) -> Projected
+  violates: fn(Output, Budget) -> Bool
 }
 
-// EnforceableLens<Output, Budget> packages a lens with its CANONICAL
-// enforcement (projection + violation relation) into ONE substrate
-// authority. Each lens declares its EnforceableLens once; users
-// referencing apply_lens cite the EnforceableLens (not lens +
+// EnforceableLens<Output, Budget, Projected> packages a lens with its CANONICAL enforcement
+// (projection + violation relation) into ONE substrate authority. Each lens declares its
+// EnforceableLens once; users referencing apply_lens cite the EnforceableLens (not lens +
 // enforcement separately).
 //
-// PARSER-LEVEL UNIQUENESS INVARIANT: the parser enforces "at most
-// ONE EnforceableLens<C, B> declaration per (Lens<C>, Budget B) pair
-// in the program". User code that declares a second EnforceableLens
-// referencing the same lens with a type-compatible Budget fails
-// parse-time with a Diagnostic naming both declarations as the
-// duplicate-canonical-enforcement violation. This is the same shape
-// as v3's other single-authority parser invariants (e.g., one
-// declaration per name; one BoundedLattice instance per type).
-// EnforcedApplication.enforceable_lens references resolve unambiguously
-// to the SOLE canonical EnforceableLens for that (lens, Budget) tuple.
+// PARSER-LEVEL UNIQUENESS INVARIANT: the parser enforces "at most ONE canonical
+// `EnforceableLens<Output, Budget, Projected>` declaration per compatible `(Lens<Output>, Budget,
+// Projected)` pairing in the program". User code that declares a second EnforceableLens for the
+// same lens with a type-compatible budget + projection fails parse-time with a Diagnostic naming
+// both declarations as the duplicate-canonical-enforcement violation. This is the same shape as
+// v3's other single-authority parser invariants (e.g., one declaration per name; one
+// BoundedLattice instance per type). `EnforcedApplication.enforceable_lens` references resolve
+// unambiguously to the SOLE canonical EnforceableLens for that bundle.
 //
-// Why parser-level, not type-level: full type-level enforcement
-// (preventing user code from EVER declaring a second EnforceableLens<C, B>)
-// would require existentials or singleton inhabitance — substrate
-// features v3 does not fully express today (per `src/v3/std/lens.dag`
-// and substrate.dag inhabitance support is sparse). The parser-level
-// uniqueness invariant achieves the same single-authority outcome
-// (no two competing canonical enforcements for a lens/budget pair)
-// at the only construction site v3 currently supports as a structural
-// gate. Future substrate hardening (existentials / dependent inhabitance)
-// would let this lift to type-level.
-type EnforceableLens<Output, Budget> {
+// Why parser-level, not type-level: full type-level enforcement (preventing user code from EVER
+// declaring a second competing bundle) would require existentials or singleton inhabitance —
+// substrate features v3 does not fully express today (per `src/v3/std/lens.dag` and substrate.dag
+// inhabitance support is sparse). The parser-level uniqueness invariant achieves the same
+// single-authority outcome at the only construction site v3 currently supports as a structural
+// gate. Future substrate hardening would let this lift to type-level.
+type EnforceableLens<Output, Budget, Projected> {
   lens: Lens<Output>
-  enforcement: LensEnforcement<Output, Budget>
+  enforcement: LensEnforcement<Output, Budget, Projected>
 }
 
-// EnforcedApplication<Output, Budget> is the carrier for enforce-mode
-// lens applications. References ONE EnforceableLens (the bundled
-// authority); cannot pair against arbitrary lens / enforcement
-// combinations.
-type EnforcedApplication<Output, Budget> {
-  enforceable_lens: EnforceableLens<Output, Budget>  // bundled lens+enforcement authority
+// EnforcedApplication<Output, Budget, Projected> is the carrier for enforce-mode lens applications.
+// References ONE EnforceableLens (the bundled authority); cannot pair against arbitrary lens /
+// enforcement combinations. The third parameter ties the `enforceable_lens.enforcement.project`
+// codomain to the same `Projected` type argument carried by the referenced `EnforceableLens`.
+type EnforcedApplication<Output, Budget, Projected> {
+  enforceable_lens: EnforceableLens<Output, Budget, Projected>  // bundled lens+enforcement authority
   section: SectionRef
-  budget: Budget                                      // matches enforceable_lens.enforcement.project's target
+  budget: Budget                                      // user-declared contract (matches `Budget` param)
   diagnostic_severity: DiagnosticSeverity
   span: SourceSpan                                    // user-authored site for diagnostic attribution
 }
@@ -166,49 +158,59 @@ The `Lens<C>` framework (per R2-T-Substrate-Lens-Primitive) parametrizes lenses
 ```dag
 // src/v3/lenses/complexity.dag
 data complexity_lens: Lens<ComplexitySummary> = ...   // rich output: work/span/asymptotic_class/work_certainty/span_certainty
-data complexity_enforcement: LensEnforcement<ComplexitySummary, AsymptoticClass> = {
-  project: |summary| summary.asymptotic_class           // budget compares against class only
-  violates: |declared, observed|                         // per-lens violation relation
-    asymptotic_class_lattice.lt(declared, observed)      // observed exceeds declared in dominance order
+data complexity_enforcement: LensEnforcement<ComplexitySummary, AsymptoticClass, AsymptoticClass> = {
+  project: |summary| summary.asymptotic_class           // `Projected` = declared budget type
+  violates: |summary, declared|                        // full summary + user budget (see LensEnforcement)
+    asymptotic_class_lattice.lt(declared, summary.asymptotic_class) // observed class exceeds declared
 }
-data complexity_enforceable: EnforceableLens<ComplexitySummary, AsymptoticClass> = {
+data complexity_enforceable: EnforceableLens<ComplexitySummary, AsymptoticClass, AsymptoticClass> = {
   lens: complexity_lens
   enforcement: complexity_enforcement                    // canonical pairing — referenced by apply_lens
 }
 
 // src/v3/lenses/cost.dag
 data cost_lens: Lens<SymbolicCost> = ...              // output IS the budget type
-data cost_enforcement: LensEnforcement<SymbolicCost, SymbolicCost> = {
-  project: |c| c                                        // identity projection
-  violates: |declared, observed|                         // observed dominates declared (worse cost)
+data cost_enforcement: LensEnforcement<SymbolicCost, SymbolicCost, SymbolicCost> = {
+  project: |c| c                                        // identity projection (`Projected = Budget`)
+  violates: |observed, declared|                        // lens output (= projected) vs user budget
     dominates(observed, declared) && !dominates(declared, observed)
 }
-data cost_enforceable: EnforceableLens<SymbolicCost, SymbolicCost> = {
+data cost_enforceable: EnforceableLens<SymbolicCost, SymbolicCost, SymbolicCost> = {
   lens: cost_lens
   enforcement: cost_enforcement
 }
 
 // src/v3/lenses/parallelism.dag
 data parallelism_lens: Lens<ParallelismMode> = ...    // output IS the budget type
-data parallelism_enforcement: LensEnforcement<ParallelismMode, ParallelismMode> = {
+data parallelism_enforcement: LensEnforcement<ParallelismMode, ParallelismMode, ParallelismMode> = {
   project: |m| m                                        // identity projection
-  violates: |declared, observed|                         // mode-mismatch: user opted in to parallel but lens couldn't prove
+  violates: |observed, declared|                        // lens output vs user budget
     match (declared, observed) {
       (OptInIndependent, Sequential) => True
       _ => False
     }
 }
-data parallelism_enforceable: EnforceableLens<ParallelismMode, ParallelismMode> = {
+data parallelism_enforceable: EnforceableLens<ParallelismMode, ParallelismMode, ParallelismMode> = {
   lens: parallelism_lens
   enforcement: parallelism_enforcement
 }
+
+// src/v3/std/timing_lens.dag (gate #58 — `Projected` is a sum distinct from `TimingBudget`)
+data timing_enforcement: LensEnforcement<TimingMeasurement, TimingBudget, TimingEnforcementProjected> = {
+  project: timing_enforcement_project
+  violates: timing_enforcement_violates
+}
+data timing_enforceable: EnforceableLens<TimingMeasurement, TimingBudget, TimingEnforcementProjected> = {
+  lens: timing_lens
+  enforcement: timing_enforcement
+}
 ```
 
 The `EnforceableLens` declarations are the canonical pairings — apply_lens declarations reference them by name. The standalone `Lens` and `LensEnforcement` declarations exist for `Lens<C>`-only consumers (general lens-fold over substrate without enforcement) and for declared-but-not-yet-bundled enforcement types respectively, but the apply_lens substrate consumes only the bundled `EnforceableLens` form.
 
 **Why the projection rather than a single carrier**: the lens output for complexity is rich (`ComplexitySummary { work, span, asymptotic_class, work_certainty, span_certainty }` — per complexity-lens §1.7, certainty is per-coordinate to avoid collapsing per-dimension proof-tightness facts) — required by the lens-fold composition (per `compose_summary_*` in complexity-lens §3.1). The budget is the user's contract — typically a single class, not a full summary. Forcing budget = output would make users author `Enforce { budget: ComplexitySummary { ... } }` — over-constrained for the common "function should be O(log n)" case. Forcing output = budget would drop work/span/per-coordinate-certainty facts the lens-fold composition needs. The projection separates the two concerns: lens output stays rich (load-bearing for composition); budget stays simple (load-bearing for user authoring).
 
-Lens-output / projection / budget compatibility is **structural by construction**: each `EnforcedApplication<Output, Budget>` declaration ties lens / enforcement / budget via two shared type parameters. A `Lens<ComplexitySummary>` can only pair with a `LensEnforcement<ComplexitySummary, B>` (some Budget B) and a `budget: B` of the same B. Mismatched triples (e.g., complexity-lens with a `SymbolicCost` budget; complexity-lens with cost's identity projection) are unrepresentable in the carrier — the type system rejects them at parse/inference time, not via a separate type-checker rule. (No `budget_type: DeclarationId` field on `Lens<C>` is needed; the type parameters `Output` and `Budget` ARE the structural authority on the `EnforcedApplication` carrier.) Each `IntrospectApplication<Output>` declaration carries only `Output` — no budget, no enforcement projection — so introspection-mode applications cannot accidentally carry irrelevant enforcement metadata.
+Lens-output / projection / budget compatibility is **structural by construction**: each `EnforcedApplication<Output, Budget, Projected>` declaration ties `Lens<Output>`, `LensEnforcement<Output, Budget, Projected>`, and `budget: Budget` via three shared type parameters (with `Projected` as the `project` codomain). Mismatched instantiations (e.g., complexity-lens with a `SymbolicCost` budget) are unrepresentable in the carrier — the type system rejects them at parse/inference time, not via a separate type-checker rule. (No `budget_type: DeclarationId` field on `Lens<C>` is needed; the type parameters **are** the structural authority.) Each `IntrospectApplication<Output>` declaration carries only `Output` — no budget, no enforcement projection — so introspection-mode applications cannot accidentally carry irrelevant enforcement metadata.
 
 ## §3. Violation policy under fail-closed discipline
 
@@ -218,9 +220,9 @@ The user reframe initially named the violation-policy axis as `CompileError | Wa
 - **Warning**: violations are logged but compilation succeeds. *Forbidden* — C-8 prohibits warnings as a steady state; the only legitimate "non-blocking detection" is introspection (no enforcement at all).
 - **Silent**: violations are silently dropped. *Forbidden* — same C-8 violation; "silent None" is named in `feedback_fail_closed_discipline` as exactly the pattern banned.
 
-The fail-closed-compatible enumeration is therefore binary, not ternary — and the budget + enforcement metadata are bundled INTO `EnforcedApplication<Output, Budget>` by construction (per §2 above). The `IntrospectApplication<Output>` carrier carries only `(lens, section, span)` — no budget, no enforcement projection. The two are **separate top-level declarations** in `.dag`; "Enforce without budget", "Introspect with budget", and "Introspect with enforcement metadata" are all structurally unrepresentable.
+The fail-closed-compatible enumeration is therefore binary, not ternary — and the budget + enforcement metadata are bundled INTO `EnforcedApplication<Output, Budget, Projected>` by construction (per §2 above). The `IntrospectApplication<Output>` carrier carries only `(lens, section, span)` — no budget, no enforcement projection. The two are **separate top-level declarations** in `.dag`; "Enforce without budget", "Introspect with budget", and "Introspect with enforcement metadata" are all structurally unrepresentable.
 
-The pairing of `budget` + `enforcement` with `Enforce` (and their absence in `Introspect`) is a state-space invariant, not a behavioral one. The type-checker has no illegal combination to reject — those states cannot be constructed (per `feedback_state_space_vs_behavioral_invariants`). Equally, the per-variant type parameters tie `EnforcedApplication.budget` to the lens's declared output type via `LensEnforcement<Output, Budget>` — lens/projection/budget mismatch is also unrepresentable.
+The pairing of `budget` + `enforcement` with `Enforce` (and their absence in `Introspect`) is a state-space invariant, not a behavioral one. The type-checker has no illegal combination to reject — those states cannot be constructed (per `feedback_state_space_vs_behavioral_invariants`). Equally, the type parameters tie `EnforcedApplication.budget` to the lens's declared output type via `LensEnforcement<Output, Budget, Projected>` — lens/projection/budget mismatch is also unrepresentable.
 
 `DiagnosticSeverity` is a single-variant nominal carrier (only `Error`). It exists as a refinement-extension point so future *non-fail-closed* surfaces (if ever added — none currently planned) can extend without changing the `Enforce` carrier shape. Per `feedback_no_annotations` and `feedback_no_metadata_markers`, the single-variant carrier is structurally honest: there is exactly one severity, named.
 
@@ -278,7 +280,7 @@ apply_lens(complexity, my_search_function, Enforce {
 **Substrate after parsing**:
 
 ```dag
-data __apply_lens_my_search_function: EnforcedApplication<ComplexitySummary, AsymptoticClass> = {
+data __apply_lens_my_search_function: EnforcedApplication<ComplexitySummary, AsymptoticClass, AsymptoticClass> = {
   enforceable_lens: complexity_enforceable            // bundled lens+enforcement (per §2)
   section: DeclarationScope { declaration: my_search_function }
   budget: O_log_n
@@ -287,7 +289,7 @@ data __apply_lens_my_search_function: EnforcedApplication<ComplexitySummary, Asy
 }
 ```
 
-**Compiler-side processing**: during the lens fold (existing infrastructure per [`docs/design-lens-framework.md`](design-lens-framework.md)), the compiler iterates over every `EnforcedApplication` declaration in the program. For each, it (a) runs the named lens against the named section to obtain the rich output, (b) calls `enforcement.project(output)` to get the budget-comparable value, (c) calls `enforcement.violates(declared_budget, projected)` to decide, (d) emits a Diagnostic if `violates` returns true. The violation relation is per-lens substrate authority (declared in the per-lens `LensEnforcement`); the fold-pass dispatch reads it directly. (`IntrospectApplication` declarations are walked separately; see §5.)
+**Compiler-side processing**: during the lens fold (existing infrastructure per [`docs/design-lens-framework.md`](design-lens-framework.md)), the compiler iterates over every `EnforcedApplication` declaration in the program. For each, it (a) runs the named lens against the named section to obtain the rich output, (b) calls `enforcement.project(output)` to obtain the `Projected` usage coordinate (for consumers that only carry the projection — when `Projected = Budget`, this is budget-shaped; for timing it is the dedicated `TimingEnforcementProjected` sum), (c) calls `enforcement.violates(output, declared_budget)` to decide, (d) emits a Diagnostic if `violates` returns true. The violation relation is per-lens substrate authority (declared in the per-lens `LensEnforcement`); the fold-pass dispatch reads it directly. (`IntrospectApplication` declarations are walked separately; see §5.)
 
 **Closure gate**: `complexity_violation_compile_error_demonstrated` — a TestClaim that constructs a function with O(n²) body + a lens application requiring O(log n) + asserts a Diagnostic is produced.
 
@@ -355,7 +357,7 @@ apply_lens(parallelism, my_loop_expression, Enforce {
 The compiler already has a lens-fold pass (per [`docs/design-lens-framework.md`](design-lens-framework.md) and the active `Lens<C>` framework). The lens-application surface adds one new step to that fold:
 
 1. **Existing**: walk every `Lens<C>` instance, apply to every program node, accumulate `Witness<C>`.
-2. **New**: walk every `EnforcedApplication` declaration AND every `IntrospectApplication` declaration (two separate walks; not one sum-walk). For each `EnforcedApplication { enforceable_lens, section, budget, ... }`: run `enforceable_lens.lens` to get output; compute `projected = enforceable_lens.enforcement.project(output)`; if `enforceable_lens.enforcement.violates(budget, projected)` returns true, emit a Diagnostic. For each `IntrospectApplication { lens, ... }`: run lens, record output for downstream lens composition + debug surfaces; no comparison.
+2. **New**: walk every `EnforcedApplication` declaration AND every `IntrospectApplication` declaration (two separate walks; not one sum-walk). For each `EnforcedApplication { enforceable_lens, section, budget, ... }`: run `enforceable_lens.lens` to get output; compute `projected = enforceable_lens.enforcement.project(output)` (typed at `Projected`; often budget-shaped when `Projected = Budget`); if `enforceable_lens.enforcement.violates(output, budget)` returns true, emit a Diagnostic. For each `IntrospectApplication { lens, ... }`: run lens, record output for downstream lens composition + debug surfaces; no comparison.
 
 The new step is structurally identical to the existing fold — same `Lens<C>` reader, same `Witness<C>` output type — with an additional budget comparison and Diagnostic emission. The implementation cost is O(1) lens-applications-per-program (typically tens to hundreds per project, not millions).
 
@@ -373,7 +375,7 @@ User-authored `apply_lens(complexity, my_function, Introspect)` is functionally
 
 This lane is **cross-program** between Substrate Manager and Verification Manager (per [`docs/r3-structure.md`](r3-structure.md) lane 16):
 
-- **Substrate Manager owns**: the `EnforceableLens<Output, Budget>` / `EnforcedApplication<Output, Budget>` / `IntrospectApplication<Output>` / `SectionRef` / `LensEnforcement<Output, Budget>` parametric carriers in `src/v3/std/lens_application.dag` (EnforceableLens is the bundled authority that EnforcedApplication references — packaging lens + enforcement into ONE substrate authority per P2 single-authority discipline); the compiler-side lens-fold integration (two separate walks — Enforce list reads `enforceable_lens.lens/enforcement`, Introspect list reads `lens` only); per-lens `EnforceableLens` declarations co-located with each lens — these are the canonical bundled authorities apply_lens references (one per lens — complexity, cost, parallelism, effect_enumeration). (No `Lens<C>.budget_type` field — the type parameters Output + Budget are the structural authority on each separate carrier; the EnforceableLens bundle prevents non-canonical lens/enforcement pairings at the application site.)
+- **Substrate Manager owns**: the `EnforceableLens<Output, Budget, Projected>` / `EnforcedApplication<Output, Budget, Projected>` / `IntrospectApplication<Output>` / `SectionRef` / `LensEnforcement<Output, Budget, Projected>` parametric carriers in `src/v3/std/lens_application.dag` (EnforceableLens is the bundled authority that EnforcedApplication references — packaging lens + enforcement into ONE substrate authority per P2 single-authority discipline); the compiler-side lens-fold integration (two separate walks — Enforce list reads `enforceable_lens.lens/enforcement`, Introspect list reads `lens` only); per-lens `EnforceableLens` declarations co-located with each lens — these are the canonical bundled authorities apply_lens references (one per lens — complexity, cost, parallelism, timing, effect_enumeration). (No `Lens<C>.budget_type` field — the type parameters `Output`, `Budget`, and `Projected` tie the `project` codomain to the same bundle the application references; the EnforceableLens bundle prevents non-canonical lens/enforcement pairings at the application site.)
 - **Verification Manager owns**: the closure-gate TestClaims (`complexity_violation_compile_error_demonstrated`, `crdt_cost_basis_demonstrated`, `memory_peak_cost_basis_demonstrated`) for **R3**; plus **`opt_in_iteration_parallelism_via_lens_application_demonstrated`** on the **R4** horizon (C1 — schedules with parallelism lens completeness per §7); cross-target equivalence on lens-application semantics (does Rust-emitted code respect the budget in the same way Python-emitted does?).
 
 The split mirrors the existing T-CostLens-Composition split: substrate authors carriers + fold semantics, Verification asserts the demonstrations.
@@ -470,13 +472,13 @@ This document does NOT modify:
 
 - The existing `Lens<C>` carrier shape (per T-Substrate-Lens-Primitive — that is R2 work already complete).
 - The existing file-glob `LensApplication` carrier (per [`docs/lens-library-design.md`](lens-library-design.md) §3 — sibling, not replacement).
-- Per-lens budget types — each lens declares its own `LensEnforcement<Output, Budget>` projection (per §2); this doc only specifies the parametric dispatch carriers `EnforcedApplication<Output, Budget>` + `IntrospectApplication<Output>` (two separate top-level types). The lens-output type stays whatever the lens chooses (rich `ComplexitySummary` for complexity; identity-projected `SymbolicCost` for cost).
+- Per-lens budget types — each lens declares its own `LensEnforcement<Output, Budget, Projected>` (per §2); this doc only specifies the parametric dispatch carriers `EnforcedApplication<Output, Budget, Projected>` + `IntrospectApplication<Output>` (two separate top-level types). The lens-output type stays whatever the lens chooses (rich `ComplexitySummary` for complexity; identity-projected `SymbolicCost` for cost; `TimingEnforcementProjected` for timing when `Projected` must diverge from `TimingBudget`).
 
 ## §10. Implementation order (sketch)
 
 Within T-Lens-Application-Surface lane (per [`docs/r3-structure.md`](r3-structure.md) closure gates):
 
-1. **Substrate carriers landing** (`lens_application_carrier_landed`, `section_ref_substrate_landed`, `lens_enforcement_carrier_landed`). Author `src/v3/std/lens_application.dag` per §2 — **two separate top-level carriers**: `EnforcedApplication<Output, Budget>` and `IntrospectApplication<Output>`, plus `SectionRef` and `LensEnforcement<Output, Budget>`. NO sum-type wrapping the two (per §2 — v3 `.dag` substrate cannot currently express per-variant generics). Each top-level carrier holds exactly its required parameters (Enforce: Output + Budget; Introspect: Output only). Co-locate per-lens `LensEnforcement` declarations with each lens (complexity → AsymptoticClass projection; cost / parallelism → identity). Type-checker integration: `(lens, section)` single-authority enforcement at parse time. (Lens/projection/budget compatibility is structural via shared Output and Budget parameters per top-level carrier; Introspect cannot accidentally carry enforcement metadata.)
+1. **Substrate carriers landing** (`lens_application_carrier_landed`, `section_ref_substrate_landed`, `lens_enforcement_carrier_landed`). Author `src/v3/std/lens_application.dag` per §2 — **two separate top-level carriers**: `EnforcedApplication<Output, Budget, Projected>` and `IntrospectApplication<Output>`, plus `SectionRef` and `LensEnforcement<Output, Budget, Projected>`. NO sum-type wrapping the two (per §2 — v3 `.dag` substrate cannot currently express per-variant generics). Each top-level carrier holds exactly its required parameters (Enforce: `Output` + `Budget` + `Projected`; Introspect: `Output` only). Co-locate per-lens `LensEnforcement` declarations with each lens (complexity → `Projected = AsymptoticClass`; cost / parallelism → `Projected = Budget` identity; timing → dedicated `TimingEnforcementProjected` sum). Type-checker integration: `(lens, section)` single-authority enforcement at parse time. (Lens/projection/budget compatibility is structural via the shared type parameters on `EnforcedApplication`; Introspect cannot accidentally carry enforcement metadata.)
 2. **Fold-pass integration** (`enforce_violation_routing_landed`). Extend the lens-fold pass to walk `EnforcedApplication` declarations + emit Diagnostics on budget violations (via `enforcement.violates`); separately walk `IntrospectApplication` declarations + record lens values for downstream composition / debug surfaces. Two separate walks (no sum to dispatch on). Synthesized default-application per §5.1.
 3. **Worked example #1: complexity contract** (`complexity_violation_compile_error_demonstrated`). TestClaim per §4.1.
 4. **Worked example #2: CRDT cost basis** (`crdt_cost_basis_demonstrated`). TestClaim per §4.2.
diff --git a/scripts/ci-merge/sg0-pr-body-append.2827.txt b/scripts/ci-merge/sg0-pr-body-append.2827.txt
new file mode 100644
index 00000000000..4aecc694114
--- /dev/null
+++ b/scripts/ci-merge/sg0-pr-body-append.2827.txt
@@ -0,0 +1,8 @@
+SG-0 hand-path delta: +1
+SG-0 pairing: (c) follow-up dispatch via gunbc#2827
+
+P5 / Dispatch-Discipline Mechanisms **(b)** — **exactly one** checkable receipt for this PR’s `src/v3/` hand-Rust (per `INVARIANTS.md` §P5 Mechanism **(b)**):
+
+**Receipt — explicit deferral (single surface):** the new `EXPECTED_HAND_AUTHORED_TEST` line in `src/v3/compiler/tests/integration/sg0_census_test.rs` plus the matching `INVARIANTS.md` SG-0 integration-test table row for `src/v3/compiler/tests/integration/t_gate_58_apply_lens_self_application_test.rs`, naming **ROADMAP.md** `### Nine lanes` → **T-PB-B** / `pb_rust_tests_outside_residual_zero` and **docs/r3-program-plan.md** §1.8 gate **#58** `apply_lens_self_application_demonstrated` (lane **T-Lens-Self-Application**). **Dissolution:** port the bootstrap timing enforcement receipt to a `.dag` `TestClaim` / generated harness when PB-Runtime/TestClaim coverage subsumes the same `generated_full_bootstrap_dag()` facts without this Rust harness.
+
+**Co-listed paths (same PR, same P5 surface — not additional receipts):** per the INVARIANTS table row’s “Co-receipt” clause on that integration-test path, this PR also expands `src/v3/compiler/src/enforced_lens_application.rs` (timing `EnforcedApplication` host consumer; dissolution: fold into the generated lens-fold path with gate #92 LAS parity) and `src/v3/compiler/build.rs` (default-rank std `STAGED_FILES` order from `import v3.std.*` lines + Kahn topo tie-break; dissolution: fuller import-graph topo in the producer if non-`v3.std` edges need ordering). They are bookkeeping for the **same** gate #58 / T-PB-B deferral above, not three independent P5(b) receipts.
diff --git a/src/v3/compiler/build.rs b/src/v3/compiler/build.rs
index 5610b5fe813..8a22d46a99b 100644
--- a/src/v3/compiler/build.rs
+++ b/src/v3/compiler/build.rs
@@ -30,6 +30,13 @@
 // dependency that needs sorting, this script grows a topological
 // pass; until then, the simple rule is sufficient.
 //
+// Staged `src/v3/std/*.dag` additionally uses a small rank list
+// (`list.dag`, `substrate*.dag`, …). Among files sharing the default rank, load order
+// breaks ties using **`import v3.std.*` edges** parsed from each staged `.dag` plus a tiny
+// [`V3_STD_BOOTSTRAP_STAGING_PRECEDES`] table for bootstrap-only holes (see
+// `collect_std_staging_dependency_edges`). Dissolution: host-side full import-graph topo when the
+// staged slice can consume the real `std` module graph without SCCs.
+//
 // **Output**: writes three Rust files:
 //
 //   pub static STAGED_FILES: &[(&str, &str)] = &[
@@ -59,19 +66,151 @@
 // runtime is still hermetic — no filesystem access at `Dag::new()`
 // time.
 
+use std::cmp::Ordering;
+use std::collections::{BTreeSet, HashMap, HashSet};
 use std::env;
 use std::fs;
 use std::path::{Path, PathBuf};
 
-fn collect_dag_entries(dir: &Path, prioritized: &[&str]) -> Vec<PathBuf> {
-    collect_dag_entries_impl(dir, prioritized, false)
+/// Bootstrap-only `(must_precede, importer)` edges among `src/v3/std/*.dag` that are **not**
+/// expressed as `import v3.std.*` lines but are still load-order facts for PB-1:
+///
+/// - `induction.dag` imports `std.algebra` / `std.computation` / `std.termination` without a
+///   `v3.std.*` surface — without these edges, Kahn can emit `induction.dag` before `algebra.dag`
+///   while `algebra.dag` still waits on `lookup.dag` (`UnknownCost` / `ConstantCost` in the
+///   bootstrap snapshot).
+/// - `t_ci_workflow_as_data_demo.dag` imports `v3.std.timing_lens` — `timing_lens.dag` must lower
+///   first so gate #58 witness rows type-check.
+///
+/// **Why not scan every `import std.*` line:** mirroring the full `std` module graph inside this
+/// slice creates SCCs that strand `timing_lens.dag` / `t_ci_workflow_as_data_demo.dag` in the
+/// lexical Kahn leftover bucket (`t_ci` `<` `timing_lens` breaks gate #58). Dissolution: host-side
+/// full import-graph topo once the staged slice can consume the real graph without SCCs.
+const V3_STD_BOOTSTRAP_STAGING_PRECEDES: &[(&str, &str)] = &[
+    ("algebra.dag", "induction.dag"),
+    ("computation.dag", "induction.dag"),
+    ("termination.dag", "induction.dag"),
+    ("timing_lens.dag", "t_ci_workflow_as_data_demo.dag"),
+];
+
+/// For `src/v3/std` only: scan each staged `.dag` for `import v3.std.<module>` lines and merge
+/// [`V3_STD_BOOTSTRAP_STAGING_PRECEDES`] when both endpoints exist.
+fn collect_std_staging_dependency_edges(entries: &[PathBuf]) -> Vec<(String, String)> {
+    let names: HashSet<String> = entries
+        .iter()
+        .filter_map(|p| p.file_name().and_then(|s| s.to_str()).map(String::from))
+        .collect();
+    let mut out = Vec::new();
+    for path in entries {
+        let Some(name) = path.file_name().and_then(|s| s.to_str()) else {
+            continue;
+        };
+        let Ok(src) = fs::read_to_string(path) else {
+            continue;
+        };
+        for line in src.lines() {
+            let t = line.trim_start();
+            let Some(rest) = t.strip_prefix("import v3.std.") else {
+                continue;
+            };
+            let mod_suffix = rest.split([' ', '{']).next().unwrap_or("");
+            if mod_suffix.is_empty() {
+                continue;
+            }
+            let dep_file = format!("{mod_suffix}.dag");
+            if dep_file == name || !names.contains(&dep_file) {
+                continue;
+            }
+            out.push((dep_file, name.to_string()));
+        }
+    }
+    for &(dep, importer) in V3_STD_BOOTSTRAP_STAGING_PRECEDES {
+        if names.contains(dep) && names.contains(importer) {
+            out.push((dep.to_string(), importer.to_string()));
+        }
+    }
+    out
+}
+
+/// `edges` are `(must_precede, dependent)` file names: `must_precede` must sort before `dependent`.
+///
+/// Returns a total rank per staged file name so `sort_by` can compare by integer index (Kahn
+/// topological order with lexical tie-break among ready nodes). Reachability-only `cmp` is not a
+/// strict weak order and can panic Rust's sort — see PR #2827 review.
+fn std_v3_import_topo_ranks(
+    names: &[String],
+    edges: &[(String, String)],
+) -> HashMap<String, usize> {
+    let name_set: HashSet<&str> = names.iter().map(String::as_str).collect();
+    let unique_edges: HashSet<(String, String)> = edges.iter().cloned().collect();
+    let mut adj: HashMap<String, Vec<String>> = HashMap::new();
+    let mut in_degree: HashMap<String, usize> = HashMap::new();
+    for n in names {
+        in_degree.insert(n.clone(), 0);
+    }
+    for (d, u) in unique_edges {
+        if d == u {
+            continue;
+        }
+        if name_set.contains(d.as_str()) && name_set.contains(u.as_str()) {
+            adj.entry(d.clone()).or_default().push(u.clone());
+            *in_degree.get_mut(&u).expect("u is a staged name") += 1;
+        }
+    }
+    let mut ready = BTreeSet::<String>::new();
+    for n in names {
+        if *in_degree.get(n).unwrap_or(&0) == 0 {
+            ready.insert(n.clone());
+        }
+    }
+    let mut order = Vec::<String>::new();
+    let mut placed = HashSet::<String>::new();
+    while let Some(n) = ready.iter().next().cloned() {
+        ready.remove(&n);
+        if !placed.insert(n.clone()) {
+            continue;
+        }
+        order.push(n.clone());
+        if let Some(succs) = adj.get(&n) {
+            for succ in succs {
+                let deg = in_degree
+                    .get_mut(succ)
+                    .expect("edge target is a staged name");
+                *deg -= 1;
+                if *deg == 0 {
+                    ready.insert(succ.clone());
+                }
+            }
+        }
+    }
+    let mut leftover: Vec<String> = names
+        .iter()
+        .filter(|n| !placed.contains(*n))
+        .cloned()
+        .collect();
+    leftover.sort();
+    order.extend(leftover);
+    order.into_iter().enumerate().map(|(i, n)| (n, i)).collect()
+}
+
+fn collect_dag_entries(
+    dir: &Path,
+    prioritized: &[&str],
+    scan_std_v3_import_edges: bool,
+) -> Vec<PathBuf> {
+    collect_dag_entries_impl(dir, prioritized, false, scan_std_v3_import_edges)
 }
 
 fn collect_dag_entries_recursive(dir: &Path, prioritized: &[&str]) -> Vec<PathBuf> {
-    collect_dag_entries_impl(dir, prioritized, true)
+    collect_dag_entries_impl(dir, prioritized, true, false)
 }
 
-fn collect_dag_entries_impl(dir: &Path, prioritized: &[&str], recursive: bool) -> Vec<PathBuf> {
+fn collect_dag_entries_impl(
+    dir: &Path,
+    prioritized: &[&str],
+    recursive: bool,
+    scan_std_v3_import_edges: bool,
+) -> Vec<PathBuf> {
     let mut entries = Vec::new();
     let mut dirs = vec![dir.to_path_buf()];
 
@@ -104,20 +243,58 @@ fn collect_dag_entries_impl(dir: &Path, prioritized: &[&str], recursive: bool) -
         }
     }
 
+    let import_edges_storage: Vec<(String, String)> =
+        if scan_std_v3_import_edges && !recursive && !entries.is_empty() {
+            collect_std_staging_dependency_edges(&entries)
+        } else {
+            Vec::new()
+        };
+
+    let import_topo_ranks: HashMap<String, usize> =
+        if scan_std_v3_import_edges && !import_edges_storage.is_empty() {
+            let names: Vec<String> = entries
+                .iter()
+                .filter_map(|p| p.file_name().and_then(|s| s.to_str()).map(String::from))
+                .collect();
+            std_v3_import_topo_ranks(&names, &import_edges_storage)
+        } else {
+            HashMap::new()
+        };
+
     entries.sort_by(|a, b| {
-        let priority_key = |path: &Path| -> (usize, String, String) {
+        let staged_file_rank = |path: &Path| -> usize {
             let name = path.file_name().and_then(|s| s.to_str()).unwrap_or("");
-            let rank = prioritized
+            prioritized
                 .iter()
                 .position(|candidate| *candidate == name)
-                .unwrap_or(prioritized.len());
-            (
-                rank,
-                name.to_string(),
-                path.strip_prefix(dir).unwrap_or(path).display().to_string(),
-            )
+                .unwrap_or(prioritized.len())
         };
-        priority_key(a).cmp(&priority_key(b))
+        let ra = staged_file_rank(a);
+        let rb = staged_file_rank(b);
+        match ra.cmp(&rb) {
+            Ordering::Equal => {
+                let name_a = a.file_name().and_then(|s| s.to_str()).unwrap_or("");
+                let name_b = b.file_name().and_then(|s| s.to_str()).unwrap_or("");
+                let import_cmp = if import_topo_ranks.is_empty() {
+                    Ordering::Equal
+                } else {
+                    let ra = import_topo_ranks.get(name_a).copied().unwrap_or(usize::MAX);
+                    let rb = import_topo_ranks.get(name_b).copied().unwrap_or(usize::MAX);
+                    ra.cmp(&rb)
+                };
+                match import_cmp {
+                    Ordering::Equal => name_a.cmp(name_b).then_with(|| {
+                        a.strip_prefix(dir)
+                            .unwrap_or(a)
+                            .display()
+                            .to_string()
+                            .cmp(&b.strip_prefix(dir).unwrap_or(b).display().to_string())
+                    }),
+                    ord => ord,
+                }
+            }
+            ord => ord,
+        }
     });
 
     entries
@@ -399,9 +576,10 @@ fn main() {
             // Python fixtures happen to load after `methods.dag` and were unaffected.
             "methods.dag",
         ],
+        true,
     );
-    let spec_entries = collect_dag_entries(&spec_dir, &["v3_l1.dag"]);
-    let mut compiler_entries = collect_dag_entries(&compiler_dir, &["pipeline.dag"]);
+    let spec_entries = collect_dag_entries(&spec_dir, &["v3_l1.dag"], false);
+    let mut compiler_entries = collect_dag_entries(&compiler_dir, &["pipeline.dag"], false);
     // `tokenize.dag` is SG-1 tokenizer authority consumed by `regen_tokenize`; it is
     // stripped from the runtime bootstrap bundle — see COMPILER_FILES header.
     // `parse_tables.dag` is SG-2c-1 grammar-tables authority consumed by
diff --git a/src/v3/compiler/src/bootstrap_generated.rs b/src/v3/compiler/src/bootstrap_generated.rs
index e875f7ead36..57f56c76c96 100644
--- a/src/v3/compiler/src/bootstrap_generated.rs
+++ b/src/v3/compiler/src/bootstrap_generated.rs
@@ -7,9 +7,9 @@ pub(crate) fn bootstrapped_fixture_dag() -> Dag {
         declarations: bootstrapped_fixture_dag_declarations(),
         ports: bootstrapped_fixture_dag_ports(),
         diagnostics: bootstrapped_fixture_dag_diagnostics(),
-        next_node_id: 856,
-        next_declaration_id: 3353,
-        next_port_id: 1027,
+        next_node_id: 888,
+        next_declaration_id: 3373,
+        next_port_id: 1061,
         primitives: PrimitiveCache::default(),
         substrate_markers: SubstrateMarkers::default(),
         realization_metas: RealizationMetaCache::default(),
@@ -24,14 +24,14 @@ 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: 3353,
+        declaration_append_begin_after_bootstrap: 3373,
     }
 }
 
 #[allow(clippy::vec_init_then_push)]
 fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
     {
-        let mut nodes = Vec::with_capacity(856);
+        let mut nodes = Vec::with_capacity(888);
         nodes.push(Behavior::Value(ValueNode {
             id: NodeId(0),
             data: LiteralBits::Int("0".to_string()),
@@ -1386,7 +1386,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(180),
-            target: TransformTarget::Callable(DeclarationId(850)),
+            target: TransformTarget::Callable(DeclarationId(906)),
             inputs: vec![PortId(183), PortId(182)],
             output: PortId(184),
             span: SourceSpan::new("src/v3/std/algebra.dag", 10291, 10322),
@@ -1402,21 +1402,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(182),
-            target: TransformTarget::Callable(DeclarationId(2067)),
+            target: TransformTarget::Callable(DeclarationId(2193)),
             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(2069)),
+            target: TransformTarget::Callable(DeclarationId(2195)),
             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(2013)),
+            target: TransformTarget::Callable(DeclarationId(2139)),
             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(2015)),
+            target: TransformTarget::Callable(DeclarationId(2141)),
             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(2070)),
+            target: TransformTarget::Callable(DeclarationId(2196)),
             inputs: vec![PortId(194)],
             output: PortId(195),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810),
@@ -1524,7 +1524,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(195),
-            target: TransformTarget::Callable(DeclarationId(857)),
+            target: TransformTarget::Callable(DeclarationId(913)),
             inputs: vec![PortId(203)],
             output: PortId(204),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11975, 12003),
@@ -1593,21 +1593,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(201),
-            target: TransformTarget::Callable(DeclarationId(854)),
+            target: TransformTarget::Callable(DeclarationId(910)),
             inputs: vec![PortId(209), PortId(210)],
             output: PortId(211),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12333, 12348),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(202),
-            target: TransformTarget::Callable(DeclarationId(2054)),
+            target: TransformTarget::Callable(DeclarationId(2180)),
             inputs: vec![PortId(211)],
             output: PortId(212),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12325, 12349),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(203),
-            target: TransformTarget::Callable(DeclarationId(870)),
+            target: TransformTarget::Callable(DeclarationId(926)),
             inputs: vec![PortId(212)],
             output: PortId(213),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12315, 12350),
@@ -1623,21 +1623,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(205),
-            target: TransformTarget::Callable(DeclarationId(854)),
+            target: TransformTarget::Callable(DeclarationId(910)),
             inputs: vec![PortId(214), PortId(215)],
             output: PortId(216),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12630, 12652),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(206),
-            target: TransformTarget::Callable(DeclarationId(2052)),
+            target: TransformTarget::Callable(DeclarationId(2178)),
             inputs: vec![PortId(216)],
             output: PortId(217),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12618, 12653),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(207),
-            target: TransformTarget::Callable(DeclarationId(870)),
+            target: TransformTarget::Callable(DeclarationId(926)),
             inputs: vec![PortId(217)],
             output: PortId(218),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12608, 12654),
@@ -1653,14 +1653,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(209),
-            target: TransformTarget::Callable(DeclarationId(863)),
+            target: TransformTarget::Callable(DeclarationId(919)),
             inputs: vec![PortId(220), PortId(219)],
             output: PortId(221),
             span: SourceSpan::new("src/v3/std/algebra.dag", 13598, 13623),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(210),
-            target: TransformTarget::Callable(DeclarationId(861)),
+            target: TransformTarget::Callable(DeclarationId(917)),
             inputs: vec![PortId(219), PortId(220)],
             output: PortId(222),
             span: SourceSpan::new("src/v3/std/algebra.dag", 13654, 13681),
@@ -1703,14 +1703,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(213),
-            target: TransformTarget::Callable(DeclarationId(863)),
+            target: TransformTarget::Callable(DeclarationId(919)),
             inputs: vec![PortId(224), PortId(225)],
             output: PortId(226),
             span: SourceSpan::new("src/v3/std/algebra.dag", 13765, 13790),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(214),
-            target: TransformTarget::Callable(DeclarationId(858)),
+            target: TransformTarget::Callable(DeclarationId(914)),
             inputs: vec![PortId(224), PortId(225)],
             output: PortId(227),
             span: SourceSpan::new("src/v3/std/algebra.dag", 13815, 13841),
@@ -1760,14 +1760,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(218),
-            target: TransformTarget::Callable(DeclarationId(2048)),
+            target: TransformTarget::Callable(DeclarationId(2174)),
             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(2072)),
+            target: TransformTarget::Callable(DeclarationId(2198)),
             inputs: vec![PortId(229), PortId(231)],
             output: PortId(232),
             span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245),
@@ -1946,7 +1946,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(232),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(920)),
             inputs: vec![PortId(253), PortId(258)],
             output: PortId(259),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15597, 15623),
@@ -2097,7 +2097,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(241),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(920)),
             inputs: vec![PortId(275), PortId(274)],
             output: PortId(276),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15912, 15942),
@@ -2122,7 +2122,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(244),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(920)),
             inputs: vec![PortId(278), PortId(279)],
             output: PortId(280),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15986, 16020),
@@ -2138,7 +2138,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(246),
-            target: TransformTarget::Callable(DeclarationId(857)),
+            target: TransformTarget::Callable(DeclarationId(913)),
             inputs: vec![PortId(281)],
             output: PortId(282),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16038, 16059),
@@ -2154,7 +2154,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(248),
-            target: TransformTarget::Callable(DeclarationId(857)),
+            target: TransformTarget::Callable(DeclarationId(913)),
             inputs: vec![PortId(283)],
             output: PortId(284),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16063, 16084),
@@ -2323,7 +2323,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(257),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(920)),
             inputs: vec![PortId(295), PortId(298)],
             output: PortId(299),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16308, 16334),
@@ -2458,56 +2458,56 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(264),
-            target: TransformTarget::Callable(DeclarationId(871)),
+            target: TransformTarget::Callable(DeclarationId(927)),
             inputs: vec![PortId(311)],
             output: PortId(312),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16927, 16945),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(265),
-            target: TransformTarget::Callable(DeclarationId(851)),
+            target: TransformTarget::Callable(DeclarationId(907)),
             inputs: vec![PortId(234)],
             output: PortId(313),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16957, 16978),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(266),
-            target: TransformTarget::Callable(DeclarationId(2074)),
+            target: TransformTarget::Callable(DeclarationId(2200)),
             inputs: vec![PortId(312), PortId(313)],
             output: PortId(314),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(267),
-            target: TransformTarget::Callable(DeclarationId(887)),
+            target: TransformTarget::Callable(DeclarationId(943)),
             inputs: vec![PortId(314)],
             output: PortId(315),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16893, 17029),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(268),
-            target: TransformTarget::Callable(DeclarationId(871)),
+            target: TransformTarget::Callable(DeclarationId(927)),
             inputs: vec![PortId(316)],
             output: PortId(317),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17092, 17110),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(269),
-            target: TransformTarget::Callable(DeclarationId(851)),
+            target: TransformTarget::Callable(DeclarationId(907)),
             inputs: vec![PortId(234)],
             output: PortId(318),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17122, 17143),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(270),
-            target: TransformTarget::Callable(DeclarationId(2076)),
+            target: TransformTarget::Callable(DeclarationId(2202)),
             inputs: vec![PortId(317), PortId(318)],
             output: PortId(319),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(271),
-            target: TransformTarget::Callable(DeclarationId(887)),
+            target: TransformTarget::Callable(DeclarationId(943)),
             inputs: vec![PortId(319)],
             output: PortId(320),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17058, 17194),
@@ -2616,7 +2616,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(274),
-            target: TransformTarget::Callable(DeclarationId(847)),
+            target: TransformTarget::Callable(DeclarationId(903)),
             inputs: vec![PortId(322), PortId(323)],
             output: PortId(324),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17268, 17290),
@@ -2811,14 +2811,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(290),
-            target: TransformTarget::Callable(DeclarationId(1222)),
+            target: TransformTarget::Callable(DeclarationId(1149)),
             inputs: vec![PortId(339)],
             output: PortId(344),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18897, 18924),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(291),
-            target: TransformTarget::Callable(DeclarationId(1222)),
+            target: TransformTarget::Callable(DeclarationId(1149)),
             inputs: vec![PortId(343)],
             output: PortId(345),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18928, 18955),
@@ -3744,7 +3744,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(346),
-            target: TransformTarget::Callable(DeclarationId(866)),
+            target: TransformTarget::Callable(DeclarationId(922)),
             inputs: vec![PortId(404), PortId(405)],
             output: PortId(406),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20681, 20707),
@@ -3787,7 +3787,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(349),
-            target: TransformTarget::Callable(DeclarationId(866)),
+            target: TransformTarget::Callable(DeclarationId(922)),
             inputs: vec![PortId(408), PortId(409)],
             output: PortId(410),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20814, 20840),
@@ -3830,49 +3830,49 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(352),
-            target: TransformTarget::Callable(DeclarationId(871)),
+            target: TransformTarget::Callable(DeclarationId(927)),
             inputs: vec![PortId(413)],
             output: PortId(414),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22044, 22062),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(353),
-            target: TransformTarget::Callable(DeclarationId(872)),
+            target: TransformTarget::Callable(DeclarationId(928)),
             inputs: vec![PortId(414)],
             output: PortId(415),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22025, 22063),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(354),
-            target: TransformTarget::Callable(DeclarationId(878)),
+            target: TransformTarget::Callable(DeclarationId(934)),
             inputs: vec![PortId(415)],
             output: PortId(416),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22014, 22064),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(355),
-            target: TransformTarget::Callable(DeclarationId(871)),
+            target: TransformTarget::Callable(DeclarationId(927)),
             inputs: vec![PortId(417)],
             output: PortId(418),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22168, 22186),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(356),
-            target: TransformTarget::Callable(DeclarationId(873)),
+            target: TransformTarget::Callable(DeclarationId(929)),
             inputs: vec![PortId(418)],
             output: PortId(419),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22136, 22187),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(357),
-            target: TransformTarget::Callable(DeclarationId(875)),
+            target: TransformTarget::Callable(DeclarationId(931)),
             inputs: vec![PortId(419)],
             output: PortId(420),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22112, 22188),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(358),
-            target: TransformTarget::Callable(DeclarationId(880)),
+            target: TransformTarget::Callable(DeclarationId(936)),
             inputs: vec![PortId(420)],
             output: PortId(421),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22097, 22189),
@@ -3993,14 +3993,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(364),
-            target: TransformTarget::Callable(DeclarationId(2077)),
+            target: TransformTarget::Callable(DeclarationId(2203)),
             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(2078)),
+            target: TransformTarget::Callable(DeclarationId(2204)),
             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(2079)),
+            target: TransformTarget::Callable(DeclarationId(2205)),
             inputs: vec![],
             output: PortId(430),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610),
@@ -4032,7 +4032,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(369),
-            target: TransformTarget::Callable(DeclarationId(876)),
+            target: TransformTarget::Callable(DeclarationId(932)),
             inputs: vec![PortId(432)],
             output: PortId(433),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22641, 22671),
@@ -4048,7 +4048,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(371),
-            target: TransformTarget::Callable(DeclarationId(872)),
+            target: TransformTarget::Callable(DeclarationId(928)),
             inputs: vec![PortId(434)],
             output: PortId(435),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22685, 22717),
@@ -4073,14 +4073,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(374),
-            target: TransformTarget::Callable(DeclarationId(872)),
+            target: TransformTarget::Callable(DeclarationId(928)),
             inputs: vec![PortId(437)],
             output: PortId(438),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22756, 22788),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(375),
-            target: TransformTarget::Callable(DeclarationId(2080)),
+            target: TransformTarget::Callable(DeclarationId(2206)),
             inputs: vec![PortId(436), PortId(438)],
             output: PortId(439),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789),
@@ -4162,7 +4162,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(380),
-            target: TransformTarget::Callable(DeclarationId(874)),
+            target: TransformTarget::Callable(DeclarationId(930)),
             inputs: vec![PortId(443)],
             output: PortId(444),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23093, 23108),
@@ -4176,21 +4176,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(382),
-            target: TransformTarget::Callable(DeclarationId(2048)),
+            target: TransformTarget::Callable(DeclarationId(2174)),
             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(2081)),
+            target: TransformTarget::Callable(DeclarationId(2207)),
             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(2082)),
+            target: TransformTarget::Callable(DeclarationId(2208)),
             inputs: vec![PortId(446), PortId(447)],
             output: PortId(448),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148),
@@ -4249,7 +4249,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(389),
-            target: TransformTarget::Callable(DeclarationId(876)),
+            target: TransformTarget::Callable(DeclarationId(932)),
             inputs: vec![PortId(453)],
             output: PortId(454),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23272, 23302),
@@ -4265,7 +4265,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(391),
-            target: TransformTarget::Callable(DeclarationId(874)),
+            target: TransformTarget::Callable(DeclarationId(930)),
             inputs: vec![PortId(455)],
             output: PortId(456),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23306, 23328),
@@ -4327,7 +4327,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(396),
-            target: TransformTarget::Callable(DeclarationId(2083)),
+            target: TransformTarget::Callable(DeclarationId(2209)),
             inputs: vec![],
             output: PortId(461),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604),
@@ -4343,7 +4343,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(398),
-            target: TransformTarget::Callable(DeclarationId(877)),
+            target: TransformTarget::Callable(DeclarationId(933)),
             inputs: vec![PortId(463)],
             output: PortId(464),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23635, 23664),
@@ -4359,7 +4359,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(400),
-            target: TransformTarget::Callable(DeclarationId(875)),
+            target: TransformTarget::Callable(DeclarationId(931)),
             inputs: vec![PortId(465)],
             output: PortId(466),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23678, 23715),
@@ -4384,14 +4384,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(403),
-            target: TransformTarget::Callable(DeclarationId(875)),
+            target: TransformTarget::Callable(DeclarationId(931)),
             inputs: vec![PortId(468)],
             output: PortId(469),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23754, 23791),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(404),
-            target: TransformTarget::Callable(DeclarationId(2084)),
+            target: TransformTarget::Callable(DeclarationId(2210)),
             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(2048)),
+            target: TransformTarget::Callable(DeclarationId(2174)),
             inputs: vec![PortId(509)],
             output: PortId(510),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25180, 25195),
@@ -4839,21 +4839,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(435),
-            target: TransformTarget::Callable(DeclarationId(2085)),
+            target: TransformTarget::Callable(DeclarationId(2211)),
             inputs: vec![PortId(515), PortId(516)],
             output: PortId(517),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(436),
-            target: TransformTarget::Callable(DeclarationId(890)),
+            target: TransformTarget::Callable(DeclarationId(946)),
             inputs: vec![PortId(517)],
             output: PortId(518),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25302, 25350),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(437),
-            target: TransformTarget::Callable(DeclarationId(879)),
+            target: TransformTarget::Callable(DeclarationId(935)),
             inputs: vec![PortId(518)],
             output: PortId(519),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25293, 25351),
@@ -4936,7 +4936,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(442),
-            target: TransformTarget::Callable(DeclarationId(2048)),
+            target: TransformTarget::Callable(DeclarationId(2174)),
             inputs: vec![PortId(523)],
             output: PortId(524),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25451, 25466),
@@ -4988,14 +4988,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(448),
-            target: TransformTarget::Callable(DeclarationId(855)),
+            target: TransformTarget::Callable(DeclarationId(911)),
             inputs: vec![PortId(529), PortId(530), PortId(531)],
             output: PortId(532),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25577, 25627),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(449),
-            target: TransformTarget::Callable(DeclarationId(2054)),
+            target: TransformTarget::Callable(DeclarationId(2180)),
             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(2048)),
+            target: TransformTarget::Callable(DeclarationId(2174)),
             inputs: vec![PortId(537)],
             output: PortId(538),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25917, 25932),
@@ -5130,7 +5130,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(460),
-            target: TransformTarget::Callable(DeclarationId(881)),
+            target: TransformTarget::Callable(DeclarationId(937)),
             inputs: vec![PortId(544), PortId(545)],
             output: PortId(546),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26086, 26135),
@@ -5164,14 +5164,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(464),
-            target: TransformTarget::Callable(DeclarationId(855)),
+            target: TransformTarget::Callable(DeclarationId(911)),
             inputs: vec![PortId(548), PortId(549), PortId(550)],
             output: PortId(551),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26171, 26221),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(465),
-            target: TransformTarget::Callable(DeclarationId(2052)),
+            target: TransformTarget::Callable(DeclarationId(2178)),
             inputs: vec![PortId(551)],
             output: PortId(552),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26159, 26222),
@@ -5277,49 +5277,49 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(470),
-            target: TransformTarget::Callable(DeclarationId(882)),
+            target: TransformTarget::Callable(DeclarationId(938)),
             inputs: vec![PortId(558), PortId(556), PortId(557)],
             output: PortId(559),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26523, 26552),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(471),
-            target: TransformTarget::Callable(DeclarationId(885)),
+            target: TransformTarget::Callable(DeclarationId(941)),
             inputs: vec![PortId(556), PortId(557)],
             output: PortId(561),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26576, 26594),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(472),
-            target: TransformTarget::Callable(DeclarationId(885)),
+            target: TransformTarget::Callable(DeclarationId(941)),
             inputs: vec![PortId(556), PortId(557)],
             output: PortId(563),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26620, 26638),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(473),
-            target: TransformTarget::Callable(DeclarationId(885)),
+            target: TransformTarget::Callable(DeclarationId(941)),
             inputs: vec![PortId(556), PortId(557)],
             output: PortId(565),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26657, 26675),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(474),
-            target: TransformTarget::Callable(DeclarationId(885)),
+            target: TransformTarget::Callable(DeclarationId(941)),
             inputs: vec![PortId(556), PortId(557)],
             output: PortId(567),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26694, 26712),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(475),
-            target: TransformTarget::Callable(DeclarationId(885)),
+            target: TransformTarget::Callable(DeclarationId(941)),
             inputs: vec![PortId(556), PortId(557)],
             output: PortId(569),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26735, 26753),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(476),
-            target: TransformTarget::Callable(DeclarationId(885)),
+            target: TransformTarget::Callable(DeclarationId(941)),
             inputs: vec![PortId(556), PortId(557)],
             output: PortId(571),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26776, 26794),
@@ -5428,49 +5428,49 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(479),
-            target: TransformTarget::Callable(DeclarationId(883)),
+            target: TransformTarget::Callable(DeclarationId(939)),
             inputs: vec![PortId(573), PortId(576), PortId(574), PortId(575)],
             output: PortId(577),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26927, 26963),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(480),
-            target: TransformTarget::Callable(DeclarationId(885)),
+            target: TransformTarget::Callable(DeclarationId(941)),
             inputs: vec![PortId(574), PortId(575)],
             output: PortId(579),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26987, 27005),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(481),
-            target: TransformTarget::Callable(DeclarationId(885)),
+            target: TransformTarget::Callable(DeclarationId(941)),
             inputs: vec![PortId(574), PortId(575)],
             output: PortId(581),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27031, 27049),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(482),
-            target: TransformTarget::Callable(DeclarationId(885)),
+            target: TransformTarget::Callable(DeclarationId(941)),
             inputs: vec![PortId(574), PortId(575)],
             output: PortId(583),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27068, 27086),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(483),
-            target: TransformTarget::Callable(DeclarationId(885)),
+            target: TransformTarget::Callable(DeclarationId(941)),
             inputs: vec![PortId(574), PortId(575)],
             output: PortId(585),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27105, 27123),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(484),
-            target: TransformTarget::Callable(DeclarationId(885)),
+            target: TransformTarget::Callable(DeclarationId(941)),
             inputs: vec![PortId(574), PortId(575)],
             output: PortId(587),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27146, 27164),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(485),
-            target: TransformTarget::Callable(DeclarationId(885)),
+            target: TransformTarget::Callable(DeclarationId(941)),
             inputs: vec![PortId(574), PortId(575)],
             output: PortId(589),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27187, 27205),
@@ -5579,21 +5579,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(488),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(920)),
             inputs: vec![PortId(591), PortId(592)],
             output: PortId(595),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27340, 27366),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(489),
-            target: TransformTarget::Callable(DeclarationId(884)),
+            target: TransformTarget::Callable(DeclarationId(940)),
             inputs: vec![PortId(591)],
             output: PortId(596),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27376, 27397),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(490),
-            target: TransformTarget::Callable(DeclarationId(885)),
+            target: TransformTarget::Callable(DeclarationId(941)),
             inputs: vec![PortId(593), PortId(594)],
             output: PortId(597),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27409, 27427),
@@ -5636,14 +5636,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(493),
-            target: TransformTarget::Callable(DeclarationId(854)),
+            target: TransformTarget::Callable(DeclarationId(910)),
             inputs: vec![PortId(599), PortId(600)],
             output: PortId(601),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27617, 27632),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(494),
-            target: TransformTarget::Callable(DeclarationId(2052)),
+            target: TransformTarget::Callable(DeclarationId(2178)),
             inputs: vec![PortId(601)],
             output: PortId(602),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27605, 27633),
@@ -5677,7 +5677,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(498),
-            target: TransformTarget::Callable(DeclarationId(863)),
+            target: TransformTarget::Callable(DeclarationId(919)),
             inputs: vec![PortId(604), PortId(606)],
             output: PortId(607),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27740, 27763),
@@ -5700,7 +5700,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(501),
-            target: TransformTarget::Callable(DeclarationId(850)),
+            target: TransformTarget::Callable(DeclarationId(906)),
             inputs: vec![PortId(608), PortId(609)],
             output: PortId(610),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27720, 27784),
@@ -5734,7 +5734,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(505),
-            target: TransformTarget::Callable(DeclarationId(2086)),
+            target: TransformTarget::Callable(DeclarationId(2212)),
             inputs: vec![],
             output: PortId(615),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995),
@@ -5750,7 +5750,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(507),
-            target: TransformTarget::Callable(DeclarationId(863)),
+            target: TransformTarget::Callable(DeclarationId(919)),
             inputs: vec![PortId(614), PortId(617)],
             output: PortId(618),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28026, 28057),
@@ -5766,7 +5766,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(509),
-            target: TransformTarget::Callable(DeclarationId(888)),
+            target: TransformTarget::Callable(DeclarationId(944)),
             inputs: vec![PortId(619), PortId(614)],
             output: PortId(620),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28071, 28116),
@@ -5791,14 +5791,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(512),
-            target: TransformTarget::Callable(DeclarationId(888)),
+            target: TransformTarget::Callable(DeclarationId(944)),
             inputs: vec![PortId(622), PortId(614)],
             output: PortId(623),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28155, 28200),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(513),
-            target: TransformTarget::Callable(DeclarationId(2087)),
+            target: TransformTarget::Callable(DeclarationId(2213)),
             inputs: vec![PortId(621), PortId(623)],
             output: PortId(624),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201),
@@ -5880,35 +5880,35 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(518),
-            target: TransformTarget::Callable(DeclarationId(851)),
+            target: TransformTarget::Callable(DeclarationId(907)),
             inputs: vec![PortId(629)],
             output: PortId(630),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28329, 28353),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(519),
-            target: TransformTarget::Callable(DeclarationId(2089)),
+            target: TransformTarget::Callable(DeclarationId(2215)),
             inputs: vec![PortId(628), PortId(630)],
             output: PortId(631),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(520),
-            target: TransformTarget::Callable(DeclarationId(887)),
+            target: TransformTarget::Callable(DeclarationId(943)),
             inputs: vec![PortId(631)],
             output: PortId(632),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28310, 28378),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(521),
-            target: TransformTarget::Callable(DeclarationId(888)),
+            target: TransformTarget::Callable(DeclarationId(944)),
             inputs: vec![PortId(628), PortId(629)],
             output: PortId(633),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28414, 28448),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(522),
-            target: TransformTarget::Callable(DeclarationId(2090)),
+            target: TransformTarget::Callable(DeclarationId(2216)),
             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(2091)),
+            target: TransformTarget::Callable(DeclarationId(2217)),
             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(2093)),
+            target: TransformTarget::Callable(DeclarationId(2219)),
             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(2048)),
+            target: TransformTarget::Callable(DeclarationId(2174)),
             inputs: vec![PortId(640)],
             output: PortId(641),
             span: SourceSpan::new("src/v3/std/induction.dag", 29099, 29114),
@@ -5997,7 +5997,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(531),
-            target: TransformTarget::Callable(DeclarationId(1089)),
+            target: TransformTarget::Callable(DeclarationId(1184)),
             inputs: vec![PortId(643)],
             output: PortId(644),
             span: SourceSpan::new("src/v3/std/induction.dag", 29146, 29172),
@@ -6013,7 +6013,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(533),
-            target: TransformTarget::Callable(DeclarationId(1090)),
+            target: TransformTarget::Callable(DeclarationId(1185)),
             inputs: vec![PortId(646)],
             output: PortId(647),
             span: SourceSpan::new("src/v3/std/induction.dag", 29209, 29238),
@@ -6029,7 +6029,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(535),
-            target: TransformTarget::Callable(DeclarationId(1092)),
+            target: TransformTarget::Callable(DeclarationId(1187)),
             inputs: vec![PortId(649)],
             output: PortId(650),
             span: SourceSpan::new("src/v3/std/induction.dag", 29279, 29307),
@@ -6054,7 +6054,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(538),
-            target: TransformTarget::Callable(DeclarationId(2056)),
+            target: TransformTarget::Callable(DeclarationId(2182)),
             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(2056)),
+            target: TransformTarget::Callable(DeclarationId(2182)),
             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(2056)),
+            target: TransformTarget::Callable(DeclarationId(2182)),
             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(2056)),
+            target: TransformTarget::Callable(DeclarationId(2182)),
             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(2056)),
+            target: TransformTarget::Callable(DeclarationId(2182)),
             inputs: vec![PortId(668)],
             output: PortId(669),
             span: SourceSpan::new("src/v3/std/induction.dag", 29761, 29835),
@@ -6283,7 +6283,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(554),
-            target: TransformTarget::Callable(DeclarationId(1090)),
+            target: TransformTarget::Callable(DeclarationId(1185)),
             inputs: vec![PortId(671)],
             output: PortId(672),
             span: SourceSpan::new("src/v3/std/induction.dag", 30026, 30060),
@@ -6299,171 +6299,163 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(556),
-            target: TransformTarget::Callable(DeclarationId(1250)),
-            inputs: vec![],
-            output: PortId(676),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3147, 3175),
+            target: TransformTarget::ResolvedFieldProject {
+                field_label: "nodes".to_string(),
+            },
+            inputs: vec![PortId(673)],
+            output: PortId(674),
+            span: SourceSpan::new("src/v3/std/workflows.dag", 1013, 1018),
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Bind(BindNode {
             id: NodeId(557),
-            target: TransformTarget::Callable(DeclarationId(1259)),
-            inputs: vec![PortId(673), PortId(676)],
-            output: PortId(677),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3123, 3176),
+            name: "behavior_spine".to_string(),
+            value: PortId(674),
+            params: vec![PortId(673)],
+            span: SourceSpan::new("src/v3/std/workflows.dag", 1011, 1018),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Value(ValueNode {
             id: NodeId(558),
-            target: TransformTarget::Callable(DeclarationId(1250)),
-            inputs: vec![],
-            output: PortId(678),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3212, 3240),
+            data: LiteralBits::String("src/v3/std/timing_lens.dag".to_string()),
+            output: PortId(675),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 1570, 1598),
+            lane2_workflow: None,
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Bind(BindNode {
             id: NodeId(559),
-            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),
+            name: "timing_lens_module_path_witness".to_string(),
+            value: PortId(675),
+            params: vec![],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 1570, 1598),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(560),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "value".to_string(),
-            },
-            inputs: vec![PortId(680)],
+            target: TransformTarget::Callable(DeclarationId(1232)),
+            inputs: vec![
+                PortId(676),
+                PortId(677),
+                PortId(678),
+                PortId(679),
+                PortId(680),
+            ],
             output: PortId(681),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3267, 3275),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7430, 7573),
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Bind(BindNode {
             id: NodeId(561),
-            target: TransformTarget::Callable(DeclarationId(1250)),
-            inputs: vec![],
-            output: PortId(682),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3290, 3318),
+            name: "gate_62_file_attachment_demo_record".to_string(),
+            value: PortId(681),
+            params: vec![
+                PortId(676),
+                PortId(677),
+                PortId(678),
+                PortId(679),
+                PortId(680),
+            ],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7430, 7573),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(562),
-            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),
+            target: TransformTarget::Callable(DeclarationId(2652)),
+            inputs: vec![],
+            output: PortId(682),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9624, 9634),
         }));
-        nodes.push(Behavior::Branch(BranchNode {
+        nodes.push(Behavior::Bind(BindNode {
             id: NodeId(563),
-            input: PortId(677),
-            paths: vec![
-                Path {
-                    body: NodeId(559),
-                    output: PortId(679),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "NoDiagnostic".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            3187,
-                            3199,
-                        ),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(562),
-                    output: PortId(683),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "SomeDiagnostic".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            3250,
-                            3277,
-                        ),
-                    },
-                    binding: Some(PayloadBinding {
-                        binding_name: "_".to_string(),
-                        payload_port: PortId(680),
-                    }),
-                },
-            ],
-            output: PortId(684),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3117, 3327),
-            emit_participation: Some(BranchEmitParticipation::UserMatch),
+            name: "timing_measurement_unobserved".to_string(),
+            value: PortId(682),
+            params: vec![],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9624, 9634),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(564),
-            target: TransformTarget::Callable(DeclarationId(1250)),
+            target: TransformTarget::Callable(DeclarationId(2652)),
             inputs: vec![],
             output: PortId(686),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3384, 3412),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9942, 9952),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(565),
-            target: TransformTarget::Callable(DeclarationId(1259)),
-            inputs: vec![PortId(673), PortId(686)],
+            target: TransformTarget::Callable(DeclarationId(2652)),
+            inputs: vec![],
             output: PortId(687),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3360, 3413),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10004, 10014),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(566),
-            target: TransformTarget::Callable(DeclarationId(1250)),
+            target: TransformTarget::Callable(DeclarationId(2654)),
             inputs: vec![],
             output: PortId(688),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3449, 3477),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10032, 10037),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(567),
-            target: TransformTarget::Callable(DeclarationId(2535)),
-            inputs: vec![PortId(688)],
+            target: TransformTarget::Callable(DeclarationId(2654)),
+            inputs: vec![],
             output: PortId(689),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3440, 3478),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10059, 10064),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(568),
             target: TransformTarget::UnresolvedFieldProject {
-                field_label: "value".to_string(),
+                field_label: "duration".to_string(),
             },
             inputs: vec![PortId(690)],
             output: PortId(691),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3504, 3512),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10084, 10095),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(569),
-            target: TransformTarget::Callable(DeclarationId(1250)),
+            target: TransformTarget::Callable(DeclarationId(2654)),
             inputs: vec![],
             output: PortId(692),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3527, 3555),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(570),
-            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),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10101, 10106),
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(571),
-            input: PortId(687),
+            id: NodeId(570),
+            input: PortId(684),
             paths: vec![
+                Path {
+                    body: NodeId(565),
+                    output: PortId(687),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Unobserved".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 9990, 10000),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(566),
+                    output: PortId(688),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Stale".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10023, 10028),
+                    },
+                    binding: None,
+                },
                 Path {
                     body: NodeId(567),
                     output: PortId(689),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "NoDiagnostic".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            3424,
-                            3436,
-                        ),
+                        name: "Ambiguous".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10046, 10055),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(570),
-                    output: PortId(693),
+                    body: NodeId(569),
+                    output: PortId(692),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "SomeDiagnostic".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            3487,
-                            3514,
-                        ),
+                        name: "Observed".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10073, 10097),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "_".to_string(),
@@ -6471,1522 +6463,1513 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     }),
                 },
             ],
-            output: PortId(694),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3354, 3564),
+            output: PortId(693),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9972, 10114),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(572),
-            target: TransformTarget::Callable(DeclarationId(1250)),
+            id: NodeId(571),
+            target: TransformTarget::Callable(DeclarationId(2652)),
             inputs: vec![],
-            output: PortId(696),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3618, 3646),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(573),
-            target: TransformTarget::Callable(DeclarationId(1259)),
-            inputs: vec![PortId(673), PortId(696)],
-            output: PortId(697),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3594, 3647),
+            output: PortId(694),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10170, 10180),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(574),
-            target: TransformTarget::Callable(DeclarationId(1250)),
+            id: NodeId(572),
+            target: TransformTarget::Callable(DeclarationId(2654)),
             inputs: vec![],
-            output: PortId(698),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3683, 3711),
+            output: PortId(695),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10198, 10203),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(575),
-            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),
+            id: NodeId(573),
+            target: TransformTarget::Callable(DeclarationId(2653)),
+            inputs: vec![],
+            output: PortId(696),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10225, 10234),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(576),
+            id: NodeId(574),
             target: TransformTarget::UnresolvedFieldProject {
-                field_label: "value".to_string(),
+                field_label: "duration".to_string(),
             },
-            inputs: vec![PortId(700)],
-            output: PortId(701),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3738, 3746),
+            inputs: vec![PortId(697)],
+            output: PortId(698),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10254, 10265),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(577),
-            target: TransformTarget::Callable(DeclarationId(1250)),
+            id: NodeId(575),
+            target: TransformTarget::Callable(DeclarationId(2653)),
             inputs: vec![],
-            output: PortId(702),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3761, 3789),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(578),
-            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),
+            output: PortId(699),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10271, 10280),
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(579),
-            input: PortId(697),
+            id: NodeId(576),
+            input: PortId(684),
             paths: vec![
                 Path {
-                    body: NodeId(575),
-                    output: PortId(699),
+                    body: NodeId(571),
+                    output: PortId(694),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "NoDiagnostic".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            3658,
-                            3670,
-                        ),
+                        name: "Unobserved".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10156, 10166),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(578),
-                    output: PortId(703),
+                    body: NodeId(572),
+                    output: PortId(695),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "SomeDiagnostic".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            3721,
-                            3748,
-                        ),
+                        name: "Stale".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10189, 10194),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(573),
+                    output: PortId(696),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Ambiguous".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10212, 10221),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(575),
+                    output: PortId(699),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Observed".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10243, 10267),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "_".to_string(),
-                        payload_port: PortId(700),
+                        payload_port: PortId(697),
                     }),
                 },
             ],
-            output: PortId(704),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3588, 3798),
+            output: PortId(700),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10138, 10288),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(577),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "duration".to_string(),
+            },
+            inputs: vec![PortId(701)],
+            output: PortId(702),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10304, 10316),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(578),
+            target: TransformTarget::Callable(DeclarationId(2652)),
+            inputs: vec![],
+            output: PortId(703),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10360, 10370),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(579),
+            target: TransformTarget::Callable(DeclarationId(2654)),
+            inputs: vec![],
+            output: PortId(704),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10388, 10393),
+        }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(580),
-            target: TransformTarget::Callable(DeclarationId(1250)),
+            target: TransformTarget::Callable(DeclarationId(2653)),
             inputs: vec![],
-            output: PortId(706),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3850, 3878),
+            output: PortId(705),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10415, 10424),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(581),
-            target: TransformTarget::Callable(DeclarationId(1259)),
-            inputs: vec![PortId(673), PortId(706)],
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "duration".to_string(),
+            },
+            inputs: vec![PortId(706)],
             output: PortId(707),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3826, 3879),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10444, 10456),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(582),
-            target: TransformTarget::Callable(DeclarationId(1250)),
-            inputs: vec![],
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "count".to_string(),
+            },
+            inputs: vec![PortId(702)],
             output: PortId(708),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3915, 3943),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10536, 10541),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(583),
-            target: TransformTarget::Callable(DeclarationId(2539)),
-            inputs: vec![PortId(708)],
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "count".to_string(),
+            },
+            inputs: vec![PortId(707)],
             output: PortId(709),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3906, 3944),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10547, 10552),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(584),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "value".to_string(),
-            },
+            target: TransformTarget::Operator(OperatorKind::Arithmetic(ArithmeticOp::Add)),
+            inputs: vec![PortId(708), PortId(709)],
+            output: PortId(710),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10533, 10552),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(585),
+            target: TransformTarget::Callable(DeclarationId(1229)),
             inputs: vec![PortId(710)],
             output: PortId(711),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3970, 3978),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10524, 10554),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(585),
-            target: TransformTarget::Callable(DeclarationId(1250)),
-            inputs: vec![],
+            id: NodeId(586),
+            target: TransformTarget::Callable(DeclarationId(2651)),
+            inputs: vec![PortId(711)],
             output: PortId(712),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3993, 4021),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10503, 10556),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(586),
-            target: TransformTarget::Callable(DeclarationId(2540)),
-            inputs: vec![PortId(712)],
+            id: NodeId(587),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "count".to_string(),
+            },
+            inputs: vec![PortId(702)],
             output: PortId(713),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3984, 4022),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10625, 10630),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(588),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "count".to_string(),
+            },
+            inputs: vec![PortId(707)],
+            output: PortId(714),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10636, 10641),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(589),
+            target: TransformTarget::Operator(OperatorKind::Comparison(ComparisonOp::Gt)),
+            inputs: vec![PortId(713), PortId(714)],
+            output: PortId(715),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10622, 10641),
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(587),
-            input: PortId(707),
+            id: NodeId(590),
+            input: PortId(715),
             paths: vec![
                 Path {
-                    body: NodeId(583),
-                    output: PortId(709),
+                    body: NodeId(577),
+                    output: PortId(702),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "NoDiagnostic".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            3890,
-                            3902,
-                        ),
+                        name: "True".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10647, 10649),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(586),
-                    output: PortId(713),
+                    body: NodeId(581),
+                    output: PortId(707),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "SomeDiagnostic".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            3953,
-                            3980,
-                        ),
+                        name: "False".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10655, 10657),
                     },
-                    binding: Some(PayloadBinding {
-                        binding_name: "_".to_string(),
-                        payload_port: PortId(710),
-                    }),
+                    binding: None,
                 },
             ],
-            output: PortId(714),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3820, 4030),
-            emit_participation: Some(BranchEmitParticipation::UserMatch),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(588),
-            target: TransformTarget::Callable(DeclarationId(1250)),
-            inputs: vec![],
             output: PortId(716),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4082, 4110),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(589),
-            target: TransformTarget::Callable(DeclarationId(1259)),
-            inputs: vec![PortId(673), PortId(716)],
-            output: PortId(717),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4058, 4111),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(590),
-            target: TransformTarget::Callable(DeclarationId(1250)),
-            inputs: vec![],
-            output: PortId(718),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4147, 4175),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10619, 10657),
+            emit_participation: None,
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(591),
-            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),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(592),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "value".to_string(),
-            },
-            inputs: vec![PortId(720)],
-            output: PortId(721),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4202, 4210),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(593),
-            target: TransformTarget::Callable(DeclarationId(1250)),
-            inputs: vec![],
-            output: PortId(722),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4225, 4253),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(594),
-            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),
+            target: TransformTarget::Callable(DeclarationId(2651)),
+            inputs: vec![PortId(716)],
+            output: PortId(717),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10584, 10672),
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(595),
-            input: PortId(717),
+            id: NodeId(592),
+            input: PortId(685),
             paths: vec![
                 Path {
-                    body: NodeId(591),
-                    output: PortId(719),
+                    body: NodeId(586),
+                    output: PortId(712),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "NoDiagnostic".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            4122,
-                            4134,
-                        ),
+                        name: "True".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10503, 10556),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(594),
-                    output: PortId(723),
+                    body: NodeId(591),
+                    output: PortId(717),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "SomeDiagnostic".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            4185,
-                            4212,
-                        ),
+                        name: "False".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10584, 10672),
                     },
-                    binding: Some(PayloadBinding {
-                        binding_name: "_".to_string(),
-                        payload_port: PortId(720),
-                    }),
+                    binding: None,
                 },
             ],
-            output: PortId(724),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4052, 4262),
-            emit_participation: Some(BranchEmitParticipation::UserMatch),
+            output: PortId(718),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10472, 10672),
+            emit_participation: None,
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(596),
-            input: PortId(674),
+            id: NodeId(593),
+            input: PortId(684),
             paths: vec![
                 Path {
-                    body: NodeId(563),
-                    output: PortId(684),
+                    body: NodeId(578),
+                    output: PortId(703),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Value".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            3099,
-                            3107,
-                        ),
+                        name: "Unobserved".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10346, 10356),
                     },
-                    binding: Some(PayloadBinding {
-                        binding_name: "_".to_string(),
-                        payload_port: PortId(675),
-                    }),
+                    binding: None,
                 },
                 Path {
-                    body: NodeId(571),
-                    output: PortId(694),
+                    body: NodeId(579),
+                    output: PortId(704),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Transform".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            3332,
-                            3344,
-                        ),
+                        name: "Stale".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10379, 10384),
                     },
-                    binding: Some(PayloadBinding {
-                        binding_name: "_".to_string(),
-                        payload_port: PortId(685),
-                    }),
+                    binding: None,
                 },
                 Path {
-                    body: NodeId(579),
-                    output: PortId(704),
+                    body: NodeId(580),
+                    output: PortId(705),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Branch".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            3569,
-                            3578,
-                        ),
+                        name: "Ambiguous".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10402, 10411),
                     },
-                    binding: Some(PayloadBinding {
-                        binding_name: "_".to_string(),
-                        payload_port: PortId(695),
-                    }),
+                    binding: None,
                 },
                 Path {
-                    body: NodeId(587),
-                    output: PortId(714),
+                    body: NodeId(592),
+                    output: PortId(718),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Loop".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            3803,
-                            3810,
-                        ),
+                        name: "Observed".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10433, 10458),
                     },
                     binding: Some(PayloadBinding {
-                        binding_name: "_".to_string(),
-                        payload_port: PortId(705),
+                        binding_name: "bx".to_string(),
+                        payload_port: PortId(706),
                     }),
                 },
+            ],
+            output: PortId(719),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10328, 10680),
+            emit_participation: Some(BranchEmitParticipation::UserMatch),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(594),
+            input: PortId(683),
+            paths: vec![
                 Path {
-                    body: NodeId(595),
-                    output: PortId(724),
+                    body: NodeId(564),
+                    output: PortId(686),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Bind".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            4035,
-                            4042,
-                        ),
+                        name: "Unobserved".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 9928, 9938),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(570),
+                    output: PortId(693),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Stale".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 9957, 9962),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(576),
+                    output: PortId(700),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Ambiguous".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10119, 10128),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(593),
+                    output: PortId(719),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Observed".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10293, 10318),
                     },
                     binding: Some(PayloadBinding {
-                        binding_name: "_".to_string(),
-                        payload_port: PortId(715),
+                        binding_name: "ax".to_string(),
+                        payload_port: PortId(701),
                     }),
                 },
             ],
-            output: PortId(725),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3085, 4266),
+            output: PortId(720),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9914, 10684),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(597),
-            name: "ci_demo_timing_read".to_string(),
-            value: PortId(725),
-            params: vec![PortId(673), PortId(674)],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3085, 4266),
+            id: NodeId(595),
+            name: "timing_measurement_lens_combine".to_string(),
+            value: PortId(720),
+            params: vec![PortId(683), PortId(684), PortId(685)],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9914, 10684),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
+        nodes.push(Behavior::Value(ValueNode {
+            id: NodeId(596),
+            data: LiteralBits::Bool(true),
+            output: PortId(723),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10890, 10894),
+            lane2_workflow: None,
+        }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(598),
-            target: TransformTarget::Callable(DeclarationId(1196)),
-            inputs: vec![PortId(726), PortId(727)],
-            output: PortId(728),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4657, 4682),
+            id: NodeId(597),
+            target: TransformTarget::Callable(DeclarationId(1240)),
+            inputs: vec![PortId(721), PortId(722), PortId(723)],
+            output: PortId(724),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10852, 10895),
         }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(599),
-            name: "ci_wad_modeled_workflow_timing_witness".to_string(),
-            value: PortId(728),
-            params: vec![PortId(726), PortId(727)],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4657, 4682),
+            id: NodeId(598),
+            name: "timing_sequential_op".to_string(),
+            value: PortId(724),
+            params: vec![PortId(721), PortId(722)],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10852, 10895),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
+        nodes.push(Behavior::Value(ValueNode {
+            id: NodeId(599),
+            data: LiteralBits::Int("0".to_string()),
+            output: PortId(725),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10947, 10948),
+            lane2_workflow: None,
+        }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(600),
-            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),
+            target: TransformTarget::Callable(DeclarationId(1229)),
+            inputs: vec![PortId(725)],
+            output: PortId(726),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10938, 10950),
         }));
         nodes.push(Behavior::Bind(BindNode {
             id: NodeId(601),
-            name: "_ci_wad_seed_list_declaration_empty".to_string(),
-            value: PortId(729),
+            name: "nanoseconds_zero".to_string(),
+            value: PortId(726),
             params: vec![],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4940, 4945),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10938, 10950),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(602),
-            target: TransformTarget::Callable(DeclarationId(2544)),
+            target: TransformTarget::Callable(DeclarationId(1242)),
             inputs: vec![],
-            output: PortId(730),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5005, 5010),
+            output: PortId(727),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11030, 11048),
         }));
-        nodes.push(Behavior::Bind(BindNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(603),
-            name: "_ci_wad_seed_list_behavior_empty".to_string(),
-            value: PortId(730),
+            target: TransformTarget::Callable(DeclarationId(2651)),
+            inputs: vec![PortId(727)],
+            output: PortId(728),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11009, 11050),
+        }));
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(604),
+            name: "timing_sequential_identity".to_string(),
+            value: PortId(728),
             params: vec![],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5005, 5010),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11009, 11050),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(604),
-            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),
-        }));
-        nodes.push(Behavior::Bind(BindNode {
+        nodes.push(Behavior::Value(ValueNode {
             id: NodeId(605),
-            name: "_ci_wad_seed_list_dagport_empty".to_string(),
-            value: PortId(731),
-            params: vec![],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5068, 5073),
+            data: LiteralBits::Bool(false),
+            output: PortId(731),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11237, 11242),
             lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(606),
-            target: TransformTarget::Callable(DeclarationId(2546)),
-            inputs: vec![],
+            target: TransformTarget::Callable(DeclarationId(1240)),
+            inputs: vec![PortId(729), PortId(730), PortId(731)],
             output: PortId(732),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5131, 5136),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11199, 11243),
         }));
         nodes.push(Behavior::Bind(BindNode {
             id: NodeId(607),
-            name: "_ci_wad_seed_list_cluster_empty".to_string(),
+            name: "timing_branch_op".to_string(),
             value: PortId(732),
-            params: vec![],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5131, 5136),
+            params: vec![PortId(729), PortId(730)],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11199, 11243),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(608),
-            target: TransformTarget::Callable(DeclarationId(2547)),
+            target: TransformTarget::Callable(DeclarationId(2661)),
             inputs: vec![],
             output: PortId(733),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5195, 5200),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11304, 11309),
         }));
         nodes.push(Behavior::Bind(BindNode {
             id: NodeId(609),
-            name: "_ci_wad_empty_list_diagnostic".to_string(),
+            name: "timing_lens_empty_corrections".to_string(),
             value: PortId(733),
             params: vec![],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5195, 5200),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11304, 11309),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(610),
-            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),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "span".to_string(),
+            },
+            inputs: vec![PortId(735)],
+            output: PortId(736),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11580, 11584),
         }));
-        nodes.push(Behavior::Bind(BindNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(611),
-            name: "_ci_wad_empty_list_witness_tm".to_string(),
-            value: PortId(734),
-            params: vec![],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5275, 5280),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "span".to_string(),
+            },
+            inputs: vec![PortId(737)],
+            output: PortId(738),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11607, 11611),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(612),
-            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),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "span".to_string(),
+            },
+            inputs: vec![PortId(739)],
+            output: PortId(740),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11633, 11637),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(613),
-            target: TransformTarget::Callable(DeclarationId(1203)),
-            inputs: vec![],
-            output: PortId(737),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5410, 5441),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "span".to_string(),
+            },
+            inputs: vec![PortId(741)],
+            output: PortId(742),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11655, 11659),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(614),
-            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),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "span".to_string(),
+            },
+            inputs: vec![PortId(743)],
+            output: PortId(744),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11683, 11687),
         }));
-        nodes.push(Behavior::Bind(BindNode {
+        nodes.push(Behavior::Branch(BranchNode {
             id: NodeId(615),
-            name: "_ci_wad_witnesses_singleton_tm".to_string(),
-            value: PortId(738),
-            params: vec![PortId(735)],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5378, 5443),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
+            input: PortId(734),
+            paths: vec![
+                Path {
+                    body: NodeId(610),
+                    output: PortId(736),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Value".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 11566, 11574),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "v".to_string(),
+                        payload_port: PortId(735),
+                    }),
+                },
+                Path {
+                    body: NodeId(611),
+                    output: PortId(738),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Transform".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 11589, 11601),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "t".to_string(),
+                        payload_port: PortId(737),
+                    }),
+                },
+                Path {
+                    body: NodeId(612),
+                    output: PortId(740),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Branch".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 11616, 11626),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "br".to_string(),
+                        payload_port: PortId(739),
+                    }),
+                },
+                Path {
+                    body: NodeId(613),
+                    output: PortId(742),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Loop".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 11642, 11649),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "l".to_string(),
+                        payload_port: PortId(741),
+                    }),
+                },
+                Path {
+                    body: NodeId(614),
+                    output: PortId(744),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Bind".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 11664, 11674),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "bind".to_string(),
+                        payload_port: PortId(743),
+                    }),
+                },
+            ],
+            output: PortId(745),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11552, 11691),
+            emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Bind(BindNode {
             id: NodeId(616),
-            target: TransformTarget::Callable(DeclarationId(1202)),
-            inputs: vec![],
-            output: PortId(740),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5544, 5575),
+            name: "timing_lens_behavior_span".to_string(),
+            value: PortId(745),
+            params: vec![PortId(734)],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11552, 11691),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(617),
-            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),
+            target: TransformTarget::Callable(DeclarationId(2336)),
+            inputs: vec![],
+            output: PortId(748),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12059, 12071),
         }));
-        nodes.push(Behavior::Bind(BindNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(618),
-            name: "_ci_wad_violations_singleton".to_string(),
-            value: PortId(741),
-            params: vec![PortId(739)],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5519, 5577),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
+            target: TransformTarget::Callable(DeclarationId(2342)),
+            inputs: vec![PortId(748)],
+            output: PortId(749),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12046, 12072),
         }));
-        nodes.push(Behavior::Value(ValueNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(619),
-            data: LiteralBits::String("ci_modeled_timing".to_string()),
-            output: PortId(743),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5712, 5731),
-            lane2_workflow: None,
+            target: TransformTarget::Callable(DeclarationId(1245)),
+            inputs: vec![],
+            output: PortId(750),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12115, 12146),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(620),
-            target: TransformTarget::Callable(DeclarationId(1204)),
-            inputs: vec![PortId(742)],
-            output: PortId(744),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5765, 5798),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(621),
-            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),
+            target: TransformTarget::Callable(DeclarationId(1039)),
+            inputs: vec![PortId(749), PortId(747), PortId(746), PortId(750)],
+            output: PortId(751),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12034, 12150),
         }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(622),
-            name: "_ci_wad_dimension_ok_tm_payload".to_string(),
-            value: PortId(745),
-            params: vec![PortId(742)],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5678, 5803),
+            id: NodeId(621),
+            name: "timing_lens_scaffold_non_evidence_diagnostic".to_string(),
+            value: PortId(751),
+            params: vec![PortId(746), PortId(747)],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12034, 12150),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(622),
+            target: TransformTarget::Callable(DeclarationId(1228)),
+            inputs: vec![],
+            output: PortId(752),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12457, 12490),
+        }));
         nodes.push(Behavior::Value(ValueNode {
             id: NodeId(623),
-            data: LiteralBits::String("ci_modeled_timing".to_string()),
-            output: PortId(748),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5960, 5979),
+            data: LiteralBits::Int("0".to_string()),
+            output: PortId(753),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12502, 12503),
             lane2_workflow: None,
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Value(ValueNode {
             id: NodeId(624),
-            target: TransformTarget::Callable(DeclarationId(1205)),
-            inputs: vec![PortId(747)],
-            output: PortId(749),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5997, 6031),
+            data: LiteralBits::Int("0".to_string()),
+            output: PortId(754),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12513, 12514),
+            lane2_workflow: None,
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(625),
-            target: TransformTarget::Callable(DeclarationId(1204)),
-            inputs: vec![PortId(746)],
-            output: PortId(750),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6048, 6081),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(626),
-            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),
+            target: TransformTarget::Callable(DeclarationId(159)),
+            inputs: vec![PortId(752), PortId(753), PortId(754)],
+            output: PortId(755),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12445, 12518),
         }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(627),
-            name: "_ci_wad_dimension_fail_tm_payload".to_string(),
-            value: PortId(751),
-            params: vec![PortId(746), PortId(747)],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5924, 6086),
+            id: NodeId(626),
+            name: "timing_lens_degenerate_empty_dag_span".to_string(),
+            value: PortId(755),
+            params: vec![],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12445, 12518),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(627),
+            target: TransformTarget::Callable(DeclarationId(1227)),
+            inputs: vec![PortId(756)],
+            output: PortId(758),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13071, 13088),
+        }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(628),
-            target: TransformTarget::Callable(DeclarationId(1309)),
-            inputs: vec![PortId(752)],
-            output: PortId(754),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6449, 6466),
+            target: TransformTarget::ResolvedFieldProject {
+                field_label: "declarations".to_string(),
+            },
+            inputs: vec![PortId(756)],
+            output: PortId(759),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13118, 13130),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(629),
-            target: TransformTarget::Callable(DeclarationId(1206)),
-            inputs: vec![PortId(753)],
-            output: PortId(755),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6482, 6516),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "head".to_string(),
+            },
+            inputs: vec![PortId(760)],
+            output: PortId(761),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13253, 13257),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(630),
             target: TransformTarget::UnresolvedFieldProject {
-                field_label: "head".to_string(),
+                field_label: "span".to_string(),
             },
-            inputs: vec![PortId(756)],
-            output: PortId(757),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6528, 6536),
+            inputs: vec![PortId(761)],
+            output: PortId(762),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13258, 13262),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(631),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "tail".to_string(),
-            },
-            inputs: vec![PortId(756)],
-            output: PortId(758),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6538, 6546),
+            target: TransformTarget::Callable(DeclarationId(1247)),
+            inputs: vec![PortId(757), PortId(762)],
+            output: PortId(763),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13199, 13263),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(632),
-            target: TransformTarget::Callable(DeclarationId(1206)),
-            inputs: vec![PortId(753)],
-            output: PortId(759),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6552, 6586),
+            target: TransformTarget::Callable(DeclarationId(2370)),
+            inputs: vec![PortId(763)],
+            output: PortId(764),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13163, 13275),
         }));
-        nodes.push(Behavior::Branch(BranchNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(633),
-            input: PortId(754),
+            target: TransformTarget::Callable(DeclarationId(1248)),
+            inputs: vec![],
+            output: PortId(765),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13419, 13458),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(634),
+            target: TransformTarget::Callable(DeclarationId(1247)),
+            inputs: vec![PortId(757), PortId(765)],
+            output: PortId(766),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13339, 13472),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(635),
+            target: TransformTarget::Callable(DeclarationId(2370)),
+            inputs: vec![PortId(766)],
+            output: PortId(767),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13303, 13484),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(636),
+            input: PortId(759),
             paths: vec![
-                Path {
-                    body: NodeId(629),
-                    output: PortId(755),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Empty".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            6473,
-                            6478,
-                        ),
-                    },
-                    binding: None,
-                },
                 Path {
                     body: NodeId(632),
-                    output: PortId(759),
+                    output: PortId(764),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Cons".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            6521,
-                            6548,
-                        ),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 13141, 13149),
                     },
                     binding: Some(PayloadBinding {
-                        binding_name: "__payload_6521_6548".to_string(),
-                        payload_port: PortId(756),
+                        binding_name: "dd".to_string(),
+                        payload_port: PortId(760),
                     }),
                 },
+                Path {
+                    body: NodeId(635),
+                    output: PortId(767),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Empty".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 13284, 13289),
+                    },
+                    binding: None,
+                },
             ],
-            output: PortId(760),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6443, 6590),
+            output: PortId(768),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13110, 13492),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
-        nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(634),
-            name: "report_dim_ok_tm".to_string(),
-            value: PortId(760),
-            params: vec![PortId(752), PortId(753)],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6443, 6590),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(635),
-            target: TransformTarget::Callable(DeclarationId(1309)),
-            inputs: vec![PortId(761)],
-            output: PortId(764),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6710, 6727),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(636),
-            target: TransformTarget::Callable(DeclarationId(1207)),
-            inputs: vec![PortId(762), PortId(763)],
-            output: PortId(765),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6743, 6785),
-        }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(637),
             target: TransformTarget::UnresolvedFieldProject {
                 field_label: "head".to_string(),
             },
-            inputs: vec![PortId(766)],
-            output: PortId(767),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6797, 6805),
+            inputs: vec![PortId(769)],
+            output: PortId(770),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13658, 13662),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(638),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "tail".to_string(),
-            },
-            inputs: vec![PortId(766)],
-            output: PortId(768),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6807, 6815),
+            target: TransformTarget::Callable(DeclarationId(1246)),
+            inputs: vec![PortId(770)],
+            output: PortId(771),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13624, 13663),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(639),
-            target: TransformTarget::Callable(DeclarationId(1207)),
-            inputs: vec![PortId(762), PortId(763)],
-            output: PortId(769),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6821, 6863),
+            target: TransformTarget::Callable(DeclarationId(1247)),
+            inputs: vec![PortId(757), PortId(771)],
+            output: PortId(772),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13552, 13673),
         }));
-        nodes.push(Behavior::Branch(BranchNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(640),
-            input: PortId(764),
+            target: TransformTarget::Callable(DeclarationId(2370)),
+            inputs: vec![PortId(772)],
+            output: PortId(773),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13520, 13681),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(641),
+            input: PortId(758),
             paths: vec![
                 Path {
                     body: NodeId(636),
-                    output: PortId(765),
+                    output: PortId(768),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Empty".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            6734,
-                            6739,
-                        ),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 13095, 13100),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(639),
-                    output: PortId(769),
+                    body: NodeId(640),
+                    output: PortId(773),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Cons".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            6790,
-                            6817,
-                        ),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 13497, 13510),
                     },
                     binding: Some(PayloadBinding {
-                        binding_name: "__payload_6790_6817".to_string(),
-                        payload_port: PortId(766),
+                        binding_name: "payload".to_string(),
+                        payload_port: PortId(769),
                     }),
                 },
             ],
-            output: PortId(770),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6704, 6867),
+            output: PortId(774),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13065, 13685),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(641),
-            name: "report_dim_fail_tm".to_string(),
-            value: PortId(770),
-            params: vec![PortId(761), PortId(762), PortId(763)],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6704, 6867),
+            id: NodeId(642),
+            name: "timing_lens_validate_non_observed".to_string(),
+            value: PortId(774),
+            params: vec![PortId(756), PortId(757)],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13065, 13685),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(642),
-            target: TransformTarget::Callable(DeclarationId(1208)),
-            inputs: vec![PortId(771), PortId(772)],
-            output: PortId(774),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7025, 7047),
-        }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(643),
             target: TransformTarget::UnresolvedFieldProject {
-                field_label: "value".to_string(),
+                field_label: "duration".to_string(),
             },
-            inputs: vec![PortId(775)],
-            output: PortId(776),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7069, 7080),
+            inputs: vec![PortId(777)],
+            output: PortId(778),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14136, 14147),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(644),
-            target: TransformTarget::Callable(DeclarationId(1209)),
-            inputs: vec![PortId(771), PortId(772), PortId(776)],
-            output: PortId(777),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7086, 7116),
+            target: TransformTarget::Callable(DeclarationId(1239)),
+            inputs: vec![],
+            output: PortId(780),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14199, 14230),
         }));
-        nodes.push(Behavior::Branch(BranchNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(645),
-            input: PortId(773),
+            target: TransformTarget::Callable(DeclarationId(1239)),
+            inputs: vec![],
+            output: PortId(782),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14253, 14284),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(646),
+            input: PortId(776),
             paths: vec![
                 Path {
-                    body: NodeId(642),
-                    output: PortId(774),
+                    body: NodeId(644),
+                    output: PortId(780),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "NoDiagnostic".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            7009,
-                            7021,
-                        ),
+                        name: "Cardinality".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14181, 14195),
                     },
-                    binding: None,
+                    binding: Some(PayloadBinding {
+                        binding_name: "_".to_string(),
+                        payload_port: PortId(779),
+                    }),
                 },
                 Path {
-                    body: NodeId(644),
-                    output: PortId(777),
+                    body: NodeId(645),
+                    output: PortId(782),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "SomeDiagnostic".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            7052,
-                            7082,
-                        ),
+                        name: "Descent".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14239, 14249),
                     },
                     binding: Some(PayloadBinding {
-                        binding_name: "diag".to_string(),
-                        payload_port: PortId(775),
+                        binding_name: "_".to_string(),
+                        payload_port: PortId(781),
                     }),
                 },
             ],
-            output: PortId(778),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6994, 7120),
+            output: PortId(783),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14159, 14292),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
-        nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(646),
-            name: "report_inhabits_branch_tm".to_string(),
-            value: PortId(778),
-            params: vec![PortId(771), PortId(772), PortId(773)],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6994, 7120),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
-        }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(647),
-            target: TransformTarget::Callable(DeclarationId(1259)),
-            inputs: vec![PortId(779), PortId(781)],
-            output: PortId(782),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7300, 7326),
+            target: TransformTarget::Callable(DeclarationId(2652)),
+            inputs: vec![],
+            output: PortId(784),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14311, 14321),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(648),
-            target: TransformTarget::Callable(DeclarationId(1210)),
-            inputs: vec![PortId(779), PortId(781), PortId(782)],
-            output: PortId(783),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7268, 7327),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(649),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "reason".to_string(),
-            },
-            inputs: vec![PortId(784)],
+            target: TransformTarget::Callable(DeclarationId(2653)),
+            inputs: vec![],
             output: PortId(785),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7343, 7352),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(650),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "at".to_string(),
-            },
-            inputs: vec![PortId(784)],
-            output: PortId(786),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7354, 7361),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14339, 14348),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(651),
-            target: TransformTarget::Callable(DeclarationId(1250)),
+            id: NodeId(649),
+            target: TransformTarget::Callable(DeclarationId(2654)),
             inputs: vec![],
-            output: PortId(787),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7412, 7440),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(652),
-            target: TransformTarget::Callable(DeclarationId(1253)),
-            inputs: vec![PortId(786)],
-            output: PortId(788),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7498, 7528),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(653),
-            target: TransformTarget::Callable(DeclarationId(1254)),
-            inputs: vec![PortId(785), PortId(788)],
-            output: PortId(789),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7450, 7529),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(654),
-            target: TransformTarget::Callable(DeclarationId(1209)),
-            inputs: vec![PortId(779), PortId(787), PortId(789)],
-            output: PortId(790),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7373, 7537),
+            output: PortId(786),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14362, 14367),
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(655),
-            input: PortId(780),
+            id: NodeId(650),
+            input: PortId(775),
             paths: vec![
                 Path {
-                    body: NodeId(648),
+                    body: NodeId(646),
                     output: PortId(783),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Inhabits".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            7253,
-                            7264,
-                        ),
+                        name: "Observed".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14125, 14149),
                     },
                     binding: Some(PayloadBinding {
-                        binding_name: "c".to_string(),
-                        payload_port: PortId(781),
+                        binding_name: "_".to_string(),
+                        payload_port: PortId(777),
                     }),
                 },
                 Path {
-                    body: NodeId(654),
-                    output: PortId(790),
+                    body: NodeId(647),
+                    output: PortId(784),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Violates".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            7332,
-                            7363,
-                        ),
+                        name: "Unobserved".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14297, 14307),
                     },
-                    binding: Some(PayloadBinding {
-                        binding_name: "__payload_7332_7363".to_string(),
-                        payload_port: PortId(784),
-                    }),
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(648),
+                    output: PortId(785),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Ambiguous".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14326, 14335),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(649),
+                    output: PortId(786),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Stale".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14353, 14358),
+                    },
+                    binding: None,
                 },
             ],
-            output: PortId(791),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7239, 7541),
+            output: PortId(787),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14108, 14371),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(656),
-            name: "dimension_report_tm_from_witness".to_string(),
-            value: PortId(791),
-            params: vec![PortId(779), PortId(780)],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7239, 7541),
+            id: NodeId(651),
+            name: "timing_measurement_iterate".to_string(),
+            value: PortId(787),
+            params: vec![PortId(775), PortId(776)],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14108, 14371),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(657),
-            target: TransformTarget::Callable(DeclarationId(1309)),
-            inputs: vec![PortId(792)],
-            output: PortId(794),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8520, 8537),
+            id: NodeId(652),
+            target: TransformTarget::Callable(DeclarationId(1227)),
+            inputs: vec![PortId(788)],
+            output: PortId(791),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15267, 15284),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(658),
+            id: NodeId(653),
             target: TransformTarget::Callable(DeclarationId(711)),
-            inputs: vec![PortId(794)],
+            inputs: vec![PortId(791)],
+            output: PortId(792),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15258, 15285),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(654),
+            target: TransformTarget::Callable(DeclarationId(1239)),
+            inputs: vec![],
+            output: PortId(793),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15300, 15331),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(655),
+            target: TransformTarget::Callable(DeclarationId(2662)),
+            inputs: vec![PortId(793)],
+            output: PortId(794),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15291, 15332),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(656),
+            target: TransformTarget::Callable(DeclarationId(1239)),
+            inputs: vec![],
             output: PortId(795),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8511, 8538),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15347, 15378),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(659),
-            target: TransformTarget::Callable(DeclarationId(1196)),
-            inputs: vec![PortId(792), PortId(793)],
+            id: NodeId(657),
+            target: TransformTarget::Callable(DeclarationId(2663)),
+            inputs: vec![PortId(795)],
             output: PortId(796),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8584, 8609),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15338, 15379),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(658),
+            input: PortId(792),
+            paths: vec![
+                Path {
+                    body: NodeId(655),
+                    output: PortId(794),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "True".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15291, 15332),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(657),
+                    output: PortId(796),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "False".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15338, 15379),
+                    },
+                    binding: None,
+                },
+            ],
+            output: PortId(797),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15255, 15379),
+            emit_participation: None,
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(659),
+            target: TransformTarget::Callable(DeclarationId(1227)),
+            inputs: vec![PortId(788)],
+            output: PortId(799),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15418, 15435),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(660),
-            target: TransformTarget::Callable(DeclarationId(1211)),
-            inputs: vec![PortId(792), PortId(796)],
-            output: PortId(797),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8548, 8610),
+            target: TransformTarget::Callable(DeclarationId(711)),
+            inputs: vec![PortId(799)],
+            output: PortId(800),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15409, 15436),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(661),
-            target: TransformTarget::Callable(DeclarationId(1197)),
-            inputs: vec![PortId(792), PortId(793)],
-            output: PortId(798),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8658, 8702),
+            target: TransformTarget::Callable(DeclarationId(1239)),
+            inputs: vec![],
+            output: PortId(801),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15451, 15482),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(662),
-            target: TransformTarget::Callable(DeclarationId(1211)),
-            inputs: vec![PortId(792), PortId(798)],
-            output: PortId(799),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8622, 8703),
+            target: TransformTarget::Callable(DeclarationId(2664)),
+            inputs: vec![PortId(801)],
+            output: PortId(802),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15442, 15483),
         }));
-        nodes.push(Behavior::Branch(BranchNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(663),
-            input: PortId(795),
+            target: TransformTarget::Callable(DeclarationId(1239)),
+            inputs: vec![],
+            output: PortId(803),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15498, 15529),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(664),
+            target: TransformTarget::Callable(DeclarationId(2665)),
+            inputs: vec![PortId(803)],
+            output: PortId(804),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15489, 15530),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(665),
+            input: PortId(800),
             paths: vec![
                 Path {
-                    body: NodeId(660),
-                    output: PortId(797),
+                    body: NodeId(662),
+                    output: PortId(802),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "True".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            8548,
-                            8610,
-                        ),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15442, 15483),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(662),
-                    output: PortId(799),
+                    body: NodeId(664),
+                    output: PortId(804),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "False".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            8622,
-                            8703,
-                        ),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15489, 15530),
                     },
                     binding: None,
                 },
             ],
-            output: PortId(800),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8508, 8703),
+            output: PortId(805),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15406, 15530),
             emit_participation: None,
         }));
-        nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(664),
-            name: "demo_ci_modeled_timing_dimension_report".to_string(),
-            value: PortId(800),
-            params: vec![PortId(792), PortId(793)],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8508, 8703),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
-        }));
-        nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(665),
-            data: LiteralBits::String("src/v3/std/timing_lens.dag".to_string()),
-            output: PortId(801),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 1472, 1500),
-            lane2_workflow: None,
-        }));
-        nodes.push(Behavior::Bind(BindNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(666),
-            name: "timing_lens_module_path_witness".to_string(),
-            value: PortId(801),
-            params: vec![],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 1472, 1500),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
+            target: TransformTarget::Callable(DeclarationId(1227)),
+            inputs: vec![PortId(788)],
+            output: PortId(807),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15566, 15583),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(667),
-            target: TransformTarget::Callable(DeclarationId(1240)),
-            inputs: vec![
-                PortId(802),
-                PortId(803),
-                PortId(804),
-                PortId(805),
-                PortId(806),
-            ],
-            output: PortId(807),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7332, 7475),
+            target: TransformTarget::Callable(DeclarationId(711)),
+            inputs: vec![PortId(807)],
+            output: PortId(808),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15557, 15584),
         }));
-        nodes.push(Behavior::Bind(BindNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(668),
-            name: "gate_62_file_attachment_demo_record".to_string(),
-            value: PortId(807),
-            params: vec![
-                PortId(802),
-                PortId(803),
-                PortId(804),
-                PortId(805),
-                PortId(806),
-            ],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7332, 7475),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
+            target: TransformTarget::Callable(DeclarationId(1239)),
+            inputs: vec![],
+            output: PortId(809),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15599, 15630),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(669),
-            target: TransformTarget::Callable(DeclarationId(2592)),
-            inputs: vec![],
-            output: PortId(808),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8272, 8282),
+            target: TransformTarget::Callable(DeclarationId(2666)),
+            inputs: vec![PortId(809)],
+            output: PortId(810),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15590, 15631),
         }));
-        nodes.push(Behavior::Bind(BindNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(670),
-            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),
+            target: TransformTarget::Callable(DeclarationId(1239)),
+            inputs: vec![],
+            output: PortId(811),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15646, 15677),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(671),
-            target: TransformTarget::Callable(DeclarationId(2592)),
-            inputs: vec![],
+            target: TransformTarget::Callable(DeclarationId(2667)),
+            inputs: vec![PortId(811)],
             output: PortId(812),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8590, 8600),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15637, 15678),
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Branch(BranchNode {
             id: NodeId(672),
-            target: TransformTarget::Callable(DeclarationId(2592)),
-            inputs: vec![],
+            input: PortId(808),
+            paths: vec![
+                Path {
+                    body: NodeId(669),
+                    output: PortId(810),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "True".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15590, 15631),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(671),
+                    output: PortId(812),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "False".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15637, 15678),
+                    },
+                    binding: None,
+                },
+            ],
             output: PortId(813),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8652, 8662),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15554, 15678),
+            emit_participation: None,
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(673),
-            target: TransformTarget::Callable(DeclarationId(2594)),
-            inputs: vec![],
-            output: PortId(814),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8680, 8685),
+            target: TransformTarget::Callable(DeclarationId(1227)),
+            inputs: vec![PortId(788)],
+            output: PortId(815),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15712, 15729),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(674),
-            target: TransformTarget::Callable(DeclarationId(2594)),
-            inputs: vec![],
-            output: PortId(815),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8707, 8712),
+            target: TransformTarget::Callable(DeclarationId(711)),
+            inputs: vec![PortId(815)],
+            output: PortId(816),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15703, 15730),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(675),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "duration".to_string(),
-            },
-            inputs: vec![PortId(816)],
+            target: TransformTarget::Callable(DeclarationId(1239)),
+            inputs: vec![],
             output: PortId(817),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8732, 8743),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15745, 15776),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(676),
-            target: TransformTarget::Callable(DeclarationId(2594)),
-            inputs: vec![],
+            target: TransformTarget::Callable(DeclarationId(2668)),
+            inputs: vec![PortId(817)],
             output: PortId(818),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8749, 8754),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15736, 15777),
         }));
-        nodes.push(Behavior::Branch(BranchNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(677),
-            input: PortId(810),
+            target: TransformTarget::Callable(DeclarationId(1239)),
+            inputs: vec![],
+            output: PortId(819),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15792, 15823),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(678),
+            target: TransformTarget::Callable(DeclarationId(2669)),
+            inputs: vec![PortId(819)],
+            output: PortId(820),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15783, 15824),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(679),
+            input: PortId(816),
             paths: vec![
                 Path {
-                    body: NodeId(672),
-                    output: PortId(813),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Unobserved".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 8638, 8648),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(673),
-                    output: PortId(814),
+                    body: NodeId(676),
+                    output: PortId(818),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Stale".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 8671, 8676),
+                        name: "True".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15736, 15777),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(674),
-                    output: PortId(815),
+                    body: NodeId(678),
+                    output: PortId(820),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Ambiguous".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 8694, 8703),
+                        name: "False".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15783, 15824),
                     },
                     binding: None,
                 },
-                Path {
-                    body: NodeId(676),
-                    output: PortId(818),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Observed".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 8721, 8745),
-                    },
-                    binding: Some(PayloadBinding {
-                        binding_name: "_".to_string(),
-                        payload_port: PortId(816),
-                    }),
-                },
             ],
-            output: PortId(819),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8620, 8762),
-            emit_participation: Some(BranchEmitParticipation::UserMatch),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(678),
-            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(2594)),
-            inputs: vec![],
             output: PortId(821),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8846, 8851),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15700, 15824),
+            emit_participation: None,
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(680),
-            target: TransformTarget::Callable(DeclarationId(2593)),
-            inputs: vec![],
-            output: PortId(822),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8873, 8882),
+            target: TransformTarget::Callable(DeclarationId(1227)),
+            inputs: vec![PortId(788)],
+            output: PortId(823),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15858, 15875),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(681),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "duration".to_string(),
-            },
+            target: TransformTarget::Callable(DeclarationId(711)),
             inputs: vec![PortId(823)],
             output: PortId(824),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8902, 8913),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15849, 15876),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(682),
-            target: TransformTarget::Callable(DeclarationId(2593)),
+            target: TransformTarget::Callable(DeclarationId(1239)),
             inputs: vec![],
             output: PortId(825),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8919, 8928),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15891, 15922),
         }));
-        nodes.push(Behavior::Branch(BranchNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(683),
-            input: PortId(810),
+            target: TransformTarget::Callable(DeclarationId(2670)),
+            inputs: vec![PortId(825)],
+            output: PortId(826),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15882, 15923),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(684),
+            target: TransformTarget::Callable(DeclarationId(1239)),
+            inputs: vec![],
+            output: PortId(827),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15938, 15969),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(685),
+            target: TransformTarget::Callable(DeclarationId(2671)),
+            inputs: vec![PortId(827)],
+            output: PortId(828),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15929, 15970),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(686),
+            input: PortId(824),
             paths: vec![
                 Path {
-                    body: NodeId(678),
-                    output: PortId(820),
+                    body: NodeId(683),
+                    output: PortId(826),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Unobserved".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 8804, 8814),
+                        name: "True".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15882, 15923),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(679),
-                    output: PortId(821),
+                    body: NodeId(685),
+                    output: PortId(828),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Stale".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 8837, 8842),
+                        name: "False".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15929, 15970),
                     },
                     binding: None,
                 },
+            ],
+            output: PortId(829),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15846, 15970),
+            emit_participation: None,
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(687),
+            input: PortId(789),
+            paths: vec![
                 Path {
-                    body: NodeId(680),
-                    output: PortId(822),
+                    body: NodeId(658),
+                    output: PortId(797),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Ambiguous".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 8860, 8869),
+                        name: "Value".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15237, 15245),
                     },
-                    binding: None,
+                    binding: Some(PayloadBinding {
+                        binding_name: "_".to_string(),
+                        payload_port: PortId(790),
+                    }),
                 },
                 Path {
-                    body: NodeId(682),
-                    output: PortId(825),
+                    body: NodeId(665),
+                    output: PortId(805),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Observed".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 8891, 8915),
+                        name: "Transform".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15384, 15396),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "_".to_string(),
+                        payload_port: PortId(798),
+                    }),
+                },
+                Path {
+                    body: NodeId(672),
+                    output: PortId(813),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Branch".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15535, 15544),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "_".to_string(),
+                        payload_port: PortId(806),
+                    }),
+                },
+                Path {
+                    body: NodeId(679),
+                    output: PortId(821),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Loop".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15683, 15690),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "_".to_string(),
+                        payload_port: PortId(814),
+                    }),
+                },
+                Path {
+                    body: NodeId(686),
+                    output: PortId(829),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Bind".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15829, 15836),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "_".to_string(),
-                        payload_port: PortId(823),
+                        payload_port: PortId(822),
                     }),
                 },
             ],
-            output: PortId(826),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8786, 8936),
-            emit_participation: Some(BranchEmitParticipation::UserMatch),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(684),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "duration".to_string(),
-            },
-            inputs: vec![PortId(827)],
-            output: PortId(828),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8952, 8964),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(685),
-            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(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(2593)),
-            inputs: vec![],
-            output: PortId(831),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9063, 9072),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15223, 15974),
+            emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Bind(BindNode {
             id: NodeId(688),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "duration".to_string(),
-            },
-            inputs: vec![PortId(832)],
-            output: PortId(833),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9092, 9104),
+            name: "timing_lens_read".to_string(),
+            value: PortId(830),
+            params: vec![PortId(788), PortId(789)],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15223, 15974),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(689),
             target: TransformTarget::UnresolvedFieldProject {
-                field_label: "count".to_string(),
+                field_label: "duration".to_string(),
             },
-            inputs: vec![PortId(828)],
+            inputs: vec![PortId(833)],
             output: PortId(834),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9184, 9189),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 16095, 16106),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(690),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "count".to_string(),
-            },
-            inputs: vec![PortId(833)],
+            target: TransformTarget::Callable(DeclarationId(1227)),
+            inputs: vec![PortId(831)],
             output: PortId(835),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9195, 9200),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 16130, 16147),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(691),
-            target: TransformTarget::Operator(OperatorKind::Arithmetic(ArithmeticOp::Add)),
-            inputs: vec![PortId(834), PortId(835)],
+            target: TransformTarget::Callable(DeclarationId(711)),
+            inputs: vec![PortId(835)],
             output: PortId(836),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9181, 9200),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 16121, 16148),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(692),
-            target: TransformTarget::Callable(DeclarationId(1237)),
-            inputs: vec![PortId(836)],
+            target: TransformTarget::Callable(DeclarationId(2369)),
+            inputs: vec![],
             output: PortId(837),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9172, 9202),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 16154, 16166),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(693),
-            target: TransformTarget::Callable(DeclarationId(2591)),
-            inputs: vec![PortId(837)],
+            target: TransformTarget::Callable(DeclarationId(2369)),
+            inputs: vec![],
             output: PortId(838),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9151, 9204),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(694),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "count".to_string(),
-            },
-            inputs: vec![PortId(828)],
-            output: PortId(839),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9273, 9278),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(695),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "count".to_string(),
-            },
-            inputs: vec![PortId(833)],
-            output: PortId(840),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9284, 9289),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(696),
-            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),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 16172, 16184),
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(697),
-            input: PortId(841),
+            id: NodeId(694),
+            input: PortId(836),
             paths: vec![
                 Path {
-                    body: NodeId(684),
-                    output: PortId(828),
+                    body: NodeId(692),
+                    output: PortId(837),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "True".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 9295, 9297),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 16154, 16166),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(688),
-                    output: PortId(833),
+                    body: NodeId(693),
+                    output: PortId(838),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "False".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 9303, 9305),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 16172, 16184),
                     },
                     binding: None,
                 },
             ],
-            output: PortId(842),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9267, 9305),
+            output: PortId(839),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 16118, 16184),
             emit_participation: None,
         }));
+        nodes.push(Behavior::Value(ValueNode { id: NodeId(695), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Unobserved is not admissible evidence at this scaffold (missing external timing row).".to_string()), output: PortId(840), span: SourceSpan::new("src/v3/std/timing_lens.dag", 16263, 16390), lane2_workflow: None }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(696),
+            target: TransformTarget::Callable(DeclarationId(1249)),
+            inputs: vec![PortId(831), PortId(840)],
+            output: PortId(841),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 16209, 16398),
+        }));
+        nodes.push(Behavior::Value(ValueNode { id: NodeId(697), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Ambiguous is not admissible evidence at this scaffold (conflicting timing facts).".to_string()), output: PortId(842), span: SourceSpan::new("src/v3/std/timing_lens.dag", 16476, 16599), lane2_workflow: None }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(698),
-            target: TransformTarget::Callable(DeclarationId(2591)),
-            inputs: vec![PortId(842)],
+            target: TransformTarget::Callable(DeclarationId(1249)),
+            inputs: vec![PortId(831), PortId(842)],
             output: PortId(843),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9232, 9320),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 16422, 16607),
         }));
-        nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(699),
-            input: PortId(811),
-            paths: vec![
-                Path {
-                    body: NodeId(693),
-                    output: PortId(838),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "True".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 9151, 9204),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(698),
-                    output: PortId(843),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "False".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 9232, 9320),
-                    },
-                    binding: None,
-                },
-            ],
-            output: PortId(844),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9120, 9320),
-            emit_participation: None,
+        nodes.push(Behavior::Value(ValueNode { id: NodeId(699), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Stale is not admissible evidence at this scaffold (digest/run mismatch vs attachment).".to_string()), output: PortId(844), span: SourceSpan::new("src/v3/std/timing_lens.dag", 16681, 16809), lane2_workflow: None }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(700),
+            target: TransformTarget::Callable(DeclarationId(1249)),
+            inputs: vec![PortId(831), PortId(844)],
+            output: PortId(845),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 16627, 16817),
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(700),
-            input: PortId(810),
+            id: NodeId(701),
+            input: PortId(832),
             paths: vec![
                 Path {
-                    body: NodeId(685),
-                    output: PortId(829),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Unobserved".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 8994, 9004),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(686),
-                    output: PortId(830),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Stale".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 9027, 9032),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(687),
-                    output: PortId(831),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Ambiguous".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 9050, 9059),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(699),
-                    output: PortId(844),
+                    body: NodeId(694),
+                    output: PortId(839),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Observed".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 9081, 9106),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 16084, 16108),
                     },
                     binding: Some(PayloadBinding {
-                        binding_name: "bx".to_string(),
-                        payload_port: PortId(832),
+                        binding_name: "_".to_string(),
+                        payload_port: PortId(833),
                     }),
                 },
-            ],
-            output: PortId(845),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8976, 9328),
-            emit_participation: Some(BranchEmitParticipation::UserMatch),
-        }));
-        nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(701),
-            input: PortId(809),
-            paths: vec![
                 Path {
-                    body: NodeId(671),
-                    output: PortId(812),
+                    body: NodeId(696),
+                    output: PortId(841),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Unobserved".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 8576, 8586),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(677),
-                    output: PortId(819),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Stale".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 8605, 8610),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 16189, 16199),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(683),
-                    output: PortId(826),
+                    body: NodeId(698),
+                    output: PortId(843),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Ambiguous".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 8767, 8776),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 16403, 16412),
                     },
                     binding: None,
                 },
@@ -7994,1312 +7977,1671 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     body: NodeId(700),
                     output: PortId(845),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Observed".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 8941, 8966),
+                        name: "Stale".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 16612, 16617),
                     },
-                    binding: Some(PayloadBinding {
-                        binding_name: "ax".to_string(),
-                        payload_port: PortId(827),
-                    }),
+                    binding: None,
                 },
             ],
             output: PortId(846),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8562, 9332),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 16063, 16821),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
             id: NodeId(702),
-            name: "timing_measurement_lens_combine".to_string(),
+            name: "timing_lens_validate".to_string(),
             value: PortId(846),
-            params: vec![PortId(809), PortId(810), PortId(811)],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8562, 9332),
+            params: vec![PortId(831), PortId(832)],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 16063, 16821),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Value(ValueNode {
             id: NodeId(703),
-            data: LiteralBits::Bool(true),
-            output: PortId(849),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9538, 9542),
+            data: LiteralBits::Int("999999999999999999".to_string()),
+            output: PortId(847),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 17987, 18005),
             lane2_workflow: None,
         }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(704),
-            target: TransformTarget::Callable(DeclarationId(1247)),
-            inputs: vec![PortId(847), PortId(848), PortId(849)],
-            output: PortId(850),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9500, 9543),
-        }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(705),
-            name: "timing_sequential_op".to_string(),
-            value: PortId(850),
-            params: vec![PortId(847), PortId(848)],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9500, 9543),
+            id: NodeId(704),
+            name: "timing_enforcement_fault_sentinel_count".to_string(),
+            value: PortId(847),
+            params: vec![],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 17987, 18005),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
-        nodes.push(Behavior::Value(ValueNode {
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(705),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "duration".to_string(),
+            },
+            inputs: vec![PortId(849)],
+            output: PortId(850),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18118, 18129),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(706),
-            data: LiteralBits::Int("0".to_string()),
+            target: TransformTarget::Callable(DeclarationId(2656)),
+            inputs: vec![PortId(850)],
             output: PortId(851),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9595, 9596),
-            lane2_workflow: None,
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18135, 18156),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(707),
-            target: TransformTarget::Callable(DeclarationId(1237)),
-            inputs: vec![PortId(851)],
+            target: TransformTarget::Callable(DeclarationId(2657)),
+            inputs: vec![],
             output: PortId(852),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9586, 9598),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18175, 18191),
         }));
-        nodes.push(Behavior::Bind(BindNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(708),
-            name: "nanoseconds_zero".to_string(),
-            value: PortId(852),
-            params: vec![],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9586, 9598),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
+            target: TransformTarget::Callable(DeclarationId(2657)),
+            inputs: vec![],
+            output: PortId(853),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18209, 18225),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(709),
-            target: TransformTarget::Callable(DeclarationId(1249)),
+            target: TransformTarget::Callable(DeclarationId(2657)),
             inputs: vec![],
-            output: PortId(853),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9678, 9696),
+            output: PortId(854),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18239, 18255),
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Branch(BranchNode {
             id: NodeId(710),
-            target: TransformTarget::Callable(DeclarationId(2591)),
-            inputs: vec![PortId(853)],
-            output: PortId(854),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9657, 9698),
+            input: PortId(848),
+            paths: vec![
+                Path {
+                    body: NodeId(706),
+                    output: PortId(851),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Observed".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 18107, 18131),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "d".to_string(),
+                        payload_port: PortId(849),
+                    }),
+                },
+                Path {
+                    body: NodeId(707),
+                    output: PortId(852),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Unobserved".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 18161, 18171),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(708),
+                    output: PortId(853),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Ambiguous".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 18196, 18205),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(709),
+                    output: PortId(854),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Stale".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 18230, 18235),
+                    },
+                    binding: None,
+                },
+            ],
+            output: PortId(855),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18093, 18259),
+            emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
             id: NodeId(711),
-            name: "timing_sequential_identity".to_string(),
-            value: PortId(854),
-            params: vec![],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9657, 9698),
+            name: "timing_enforcement_project".to_string(),
+            value: PortId(855),
+            params: vec![PortId(848)],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18093, 18259),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
-        nodes.push(Behavior::Value(ValueNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(712),
-            data: LiteralBits::Bool(false),
-            output: PortId(857),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9885, 9890),
-            lane2_workflow: None,
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "duration".to_string(),
+            },
+            inputs: vec![PortId(858)],
+            output: PortId(859),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18375, 18386),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(713),
-            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),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "count".to_string(),
+            },
+            inputs: vec![PortId(859)],
+            output: PortId(860),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18403, 18408),
         }));
-        nodes.push(Behavior::Bind(BindNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(714),
-            name: "timing_branch_op".to_string(),
-            value: PortId(858),
-            params: vec![PortId(855), PortId(856)],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9847, 9891),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
+            target: TransformTarget::ResolvedFieldProject {
+                field_label: "max".to_string(),
+            },
+            inputs: vec![PortId(857)],
+            output: PortId(861),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18420, 18423),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(715),
-            target: TransformTarget::Callable(DeclarationId(2596)),
-            inputs: vec![],
-            output: PortId(859),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9952, 9957),
-        }));
-        nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(716),
-            name: "timing_lens_empty_corrections".to_string(),
-            value: PortId(859),
-            params: vec![],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9952, 9957),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(717),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "span".to_string(),
+            target: TransformTarget::ResolvedFieldProject {
+                field_label: "count".to_string(),
             },
             inputs: vec![PortId(861)],
             output: PortId(862),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10228, 10232),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18424, 18429),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(718),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "span".to_string(),
-            },
-            inputs: vec![PortId(863)],
+            id: NodeId(716),
+            target: TransformTarget::Operator(OperatorKind::Comparison(ComparisonOp::Gt)),
+            inputs: vec![PortId(860), PortId(862)],
+            output: PortId(863),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18401, 18429),
+        }));
+        nodes.push(Behavior::Value(ValueNode {
+            id: NodeId(717),
+            data: LiteralBits::Int("0".to_string()),
             output: PortId(864),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10255, 10259),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18435, 18436),
+            lane2_workflow: None,
+        }));
+        nodes.push(Behavior::Value(ValueNode {
+            id: NodeId(718),
+            data: LiteralBits::Int("0".to_string()),
+            output: PortId(865),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18440, 18441),
+            lane2_workflow: None,
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(719),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "span".to_string(),
-            },
-            inputs: vec![PortId(865)],
+            target: TransformTarget::Operator(OperatorKind::Comparison(ComparisonOp::Eq)),
+            inputs: vec![PortId(864), PortId(865)],
             output: PortId(866),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10281, 10285),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18435, 18441),
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Value(ValueNode {
             id: NodeId(720),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "span".to_string(),
-            },
-            inputs: vec![PortId(867)],
+            data: LiteralBits::Int("0".to_string()),
+            output: PortId(867),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18447, 18448),
+            lane2_workflow: None,
+        }));
+        nodes.push(Behavior::Value(ValueNode {
+            id: NodeId(721),
+            data: LiteralBits::Int("1".to_string()),
             output: PortId(868),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10303, 10307),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18452, 18453),
+            lane2_workflow: None,
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(721),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "span".to_string(),
-            },
-            inputs: vec![PortId(869)],
-            output: PortId(870),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10331, 10335),
+            id: NodeId(722),
+            target: TransformTarget::Operator(OperatorKind::Comparison(ComparisonOp::Eq)),
+            inputs: vec![PortId(867), PortId(868)],
+            output: PortId(869),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18447, 18453),
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(722),
-            input: PortId(860),
+            id: NodeId(723),
+            input: PortId(863),
             paths: vec![
-                Path {
-                    body: NodeId(717),
-                    output: PortId(862),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Value".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10214, 10222),
-                    },
-                    binding: Some(PayloadBinding {
-                        binding_name: "v".to_string(),
-                        payload_port: PortId(861),
-                    }),
-                },
-                Path {
-                    body: NodeId(718),
-                    output: PortId(864),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Transform".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10237, 10249),
-                    },
-                    binding: Some(PayloadBinding {
-                        binding_name: "t".to_string(),
-                        payload_port: PortId(863),
-                    }),
-                },
                 Path {
                     body: NodeId(719),
                     output: PortId(866),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Branch".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10264, 10274),
-                    },
-                    binding: Some(PayloadBinding {
-                        binding_name: "br".to_string(),
-                        payload_port: PortId(865),
-                    }),
-                },
-                Path {
-                    body: NodeId(720),
-                    output: PortId(868),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Loop".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10290, 10297),
+                        name: "True".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 18435, 18441),
                     },
-                    binding: Some(PayloadBinding {
-                        binding_name: "l".to_string(),
-                        payload_port: PortId(867),
-                    }),
+                    binding: None,
                 },
                 Path {
-                    body: NodeId(721),
-                    output: PortId(870),
+                    body: NodeId(722),
+                    output: PortId(869),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Bind".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10312, 10322),
+                        name: "False".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 18447, 18453),
                     },
-                    binding: Some(PayloadBinding {
-                        binding_name: "bind".to_string(),
-                        payload_port: PortId(869),
-                    }),
+                    binding: None,
                 },
             ],
-            output: PortId(871),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10200, 10339),
-            emit_participation: Some(BranchEmitParticipation::UserMatch),
-        }));
-        nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(723),
-            name: "timing_lens_behavior_span".to_string(),
-            value: PortId(871),
-            params: vec![PortId(860)],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10200, 10339),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
+            output: PortId(870),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18398, 18453),
+            emit_participation: None,
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Value(ValueNode {
             id: NodeId(724),
-            target: TransformTarget::Callable(DeclarationId(2276)),
-            inputs: vec![],
-            output: PortId(874),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10707, 10719),
+            data: LiteralBits::Int("0".to_string()),
+            output: PortId(871),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18472, 18473),
+            lane2_workflow: None,
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Value(ValueNode {
             id: NodeId(725),
-            target: TransformTarget::Callable(DeclarationId(2282)),
-            inputs: vec![PortId(874)],
-            output: PortId(875),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10694, 10720),
+            data: LiteralBits::Int("0".to_string()),
+            output: PortId(872),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18477, 18478),
+            lane2_workflow: None,
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(726),
-            target: TransformTarget::Callable(DeclarationId(1252)),
-            inputs: vec![],
-            output: PortId(876),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10763, 10794),
+            target: TransformTarget::Operator(OperatorKind::Comparison(ComparisonOp::Eq)),
+            inputs: vec![PortId(871), PortId(872)],
+            output: PortId(873),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18472, 18478),
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Value(ValueNode {
             id: NodeId(727),
-            target: TransformTarget::Callable(DeclarationId(982)),
-            inputs: vec![PortId(875), PortId(873), PortId(872), PortId(876)],
-            output: PortId(877),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10682, 10798),
+            data: LiteralBits::Int("0".to_string()),
+            output: PortId(874),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18496, 18497),
+            lane2_workflow: None,
         }));
-        nodes.push(Behavior::Bind(BindNode {
+        nodes.push(Behavior::Value(ValueNode {
             id: NodeId(728),
-            name: "timing_lens_scaffold_non_evidence_diagnostic".to_string(),
-            value: PortId(877),
-            params: vec![PortId(872), PortId(873)],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10682, 10798),
+            data: LiteralBits::Int("0".to_string()),
+            output: PortId(875),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18501, 18502),
             lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(729),
-            target: TransformTarget::Callable(DeclarationId(1236)),
-            inputs: vec![],
-            output: PortId(878),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11105, 11138),
+            target: TransformTarget::Operator(OperatorKind::Comparison(ComparisonOp::Eq)),
+            inputs: vec![PortId(874), PortId(875)],
+            output: PortId(876),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18496, 18502),
         }));
         nodes.push(Behavior::Value(ValueNode {
             id: NodeId(730),
             data: LiteralBits::Int("0".to_string()),
-            output: PortId(879),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11150, 11151),
+            output: PortId(877),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18516, 18517),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
             id: NodeId(731),
             data: LiteralBits::Int("0".to_string()),
-            output: PortId(880),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11161, 11162),
+            output: PortId(878),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18521, 18522),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(732),
-            target: TransformTarget::Callable(DeclarationId(159)),
-            inputs: vec![PortId(878), PortId(879), PortId(880)],
-            output: PortId(881),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11093, 11166),
+            target: TransformTarget::Operator(OperatorKind::Comparison(ComparisonOp::Eq)),
+            inputs: vec![PortId(877), PortId(878)],
+            output: PortId(879),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18516, 18522),
         }));
-        nodes.push(Behavior::Bind(BindNode {
+        nodes.push(Behavior::Branch(BranchNode {
             id: NodeId(733),
-            name: "timing_lens_degenerate_empty_dag_span".to_string(),
-            value: PortId(881),
-            params: vec![],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11093, 11166),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
+            input: PortId(856),
+            paths: vec![
+                Path {
+                    body: NodeId(723),
+                    output: PortId(870),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Observed".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 18364, 18388),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "d".to_string(),
+                        payload_port: PortId(858),
+                    }),
+                },
+                Path {
+                    body: NodeId(726),
+                    output: PortId(873),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Unobserved".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 18458, 18468),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(729),
+                    output: PortId(876),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Ambiguous".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 18483, 18492),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(732),
+                    output: PortId(879),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Stale".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 18507, 18512),
+                    },
+                    binding: None,
+                },
+            ],
+            output: PortId(880),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18350, 18526),
+            emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Bind(BindNode {
             id: NodeId(734),
-            target: TransformTarget::Callable(DeclarationId(1309)),
-            inputs: vec![PortId(882)],
-            output: PortId(884),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11719, 11736),
+            name: "timing_enforcement_violates".to_string(),
+            value: PortId(880),
+            params: vec![PortId(856), PortId(857)],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18350, 18526),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(735),
-            target: TransformTarget::ResolvedFieldProject {
-                field_label: "declarations".to_string(),
-            },
-            inputs: vec![PortId(882)],
-            output: PortId(885),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11766, 11778),
+            target: TransformTarget::Callable(DeclarationId(1243)),
+            inputs: vec![],
+            output: PortId(884),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3308, 3336),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(736),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "head".to_string(),
-            },
-            inputs: vec![PortId(886)],
-            output: PortId(887),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11901, 11905),
+            target: TransformTarget::Callable(DeclarationId(1252)),
+            inputs: vec![PortId(881), PortId(884)],
+            output: PortId(885),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3284, 3337),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(737),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "span".to_string(),
-            },
-            inputs: vec![PortId(887)],
-            output: PortId(888),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11906, 11910),
+            target: TransformTarget::Callable(DeclarationId(1243)),
+            inputs: vec![],
+            output: PortId(886),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3373, 3401),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(738),
-            target: TransformTarget::Callable(DeclarationId(1254)),
-            inputs: vec![PortId(883), PortId(888)],
-            output: PortId(889),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11847, 11911),
+            target: TransformTarget::Callable(DeclarationId(2693)),
+            inputs: vec![PortId(886)],
+            output: PortId(887),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3364, 3402),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(739),
-            target: TransformTarget::Callable(DeclarationId(2310)),
-            inputs: vec![PortId(889)],
-            output: PortId(890),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11811, 11923),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "value".to_string(),
+            },
+            inputs: vec![PortId(888)],
+            output: PortId(889),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3428, 3436),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(740),
-            target: TransformTarget::Callable(DeclarationId(1255)),
+            target: TransformTarget::Callable(DeclarationId(1243)),
             inputs: vec![],
-            output: PortId(891),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12067, 12106),
+            output: PortId(890),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3451, 3479),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(741),
-            target: TransformTarget::Callable(DeclarationId(1254)),
-            inputs: vec![PortId(883), PortId(891)],
-            output: PortId(892),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11987, 12120),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(742),
-            target: TransformTarget::Callable(DeclarationId(2310)),
-            inputs: vec![PortId(892)],
-            output: PortId(893),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11951, 12132),
+            target: TransformTarget::Callable(DeclarationId(2694)),
+            inputs: vec![PortId(890)],
+            output: PortId(891),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3442, 3480),
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(743),
+            id: NodeId(742),
             input: PortId(885),
             paths: vec![
                 Path {
-                    body: NodeId(739),
-                    output: PortId(890),
+                    body: NodeId(738),
+                    output: PortId(887),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Cons".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 11789, 11797),
+                        name: "NoDiagnostic".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            3348,
+                            3360,
+                        ),
                     },
-                    binding: Some(PayloadBinding {
-                        binding_name: "dd".to_string(),
-                        payload_port: PortId(886),
-                    }),
+                    binding: None,
                 },
                 Path {
-                    body: NodeId(742),
-                    output: PortId(893),
+                    body: NodeId(741),
+                    output: PortId(891),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Empty".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 11932, 11937),
+                        name: "SomeDiagnostic".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            3411,
+                            3438,
+                        ),
                     },
-                    binding: None,
+                    binding: Some(PayloadBinding {
+                        binding_name: "_".to_string(),
+                        payload_port: PortId(888),
+                    }),
                 },
             ],
-            output: PortId(894),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11758, 12140),
+            output: PortId(892),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3278, 3488),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(744),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "head".to_string(),
-            },
-            inputs: vec![PortId(895)],
-            output: PortId(896),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12306, 12310),
+            id: NodeId(743),
+            target: TransformTarget::Callable(DeclarationId(1243)),
+            inputs: vec![],
+            output: PortId(894),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3545, 3573),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(744),
+            target: TransformTarget::Callable(DeclarationId(1252)),
+            inputs: vec![PortId(881), PortId(894)],
+            output: PortId(895),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3521, 3574),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(745),
-            target: TransformTarget::Callable(DeclarationId(1253)),
-            inputs: vec![PortId(896)],
-            output: PortId(897),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12272, 12311),
+            target: TransformTarget::Callable(DeclarationId(1243)),
+            inputs: vec![],
+            output: PortId(896),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3610, 3638),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(746),
-            target: TransformTarget::Callable(DeclarationId(1254)),
-            inputs: vec![PortId(883), PortId(897)],
-            output: PortId(898),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12200, 12321),
+            target: TransformTarget::Callable(DeclarationId(2695)),
+            inputs: vec![PortId(896)],
+            output: PortId(897),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3601, 3639),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(747),
-            target: TransformTarget::Callable(DeclarationId(2310)),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "value".to_string(),
+            },
             inputs: vec![PortId(898)],
             output: PortId(899),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12168, 12329),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3665, 3673),
         }));
-        nodes.push(Behavior::Branch(BranchNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(748),
-            input: PortId(884),
+            target: TransformTarget::Callable(DeclarationId(1243)),
+            inputs: vec![],
+            output: PortId(900),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3688, 3716),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(749),
+            target: TransformTarget::Callable(DeclarationId(2696)),
+            inputs: vec![PortId(900)],
+            output: PortId(901),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3679, 3717),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(750),
+            input: PortId(895),
             paths: vec![
                 Path {
-                    body: NodeId(743),
-                    output: PortId(894),
+                    body: NodeId(746),
+                    output: PortId(897),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Empty".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 11743, 11748),
+                        name: "NoDiagnostic".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            3585,
+                            3597,
+                        ),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(747),
-                    output: PortId(899),
+                    body: NodeId(749),
+                    output: PortId(901),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Cons".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 12145, 12158),
+                        name: "SomeDiagnostic".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            3648,
+                            3675,
+                        ),
                     },
                     binding: Some(PayloadBinding {
-                        binding_name: "payload".to_string(),
-                        payload_port: PortId(895),
+                        binding_name: "_".to_string(),
+                        payload_port: PortId(898),
                     }),
                 },
             ],
-            output: PortId(900),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11713, 12333),
+            output: PortId(902),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3515, 3725),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
-        nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(749),
-            name: "timing_lens_validate_non_observed".to_string(),
-            value: PortId(900),
-            params: vec![PortId(882), PortId(883)],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11713, 12333),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(750),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "duration".to_string(),
-            },
-            inputs: vec![PortId(903)],
-            output: PortId(904),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12784, 12795),
-        }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(751),
-            target: TransformTarget::Callable(DeclarationId(1246)),
+            target: TransformTarget::Callable(DeclarationId(1243)),
             inputs: vec![],
-            output: PortId(906),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12847, 12878),
+            output: PortId(904),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3779, 3807),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(752),
-            target: TransformTarget::Callable(DeclarationId(1246)),
-            inputs: vec![],
-            output: PortId(908),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12901, 12932),
+            target: TransformTarget::Callable(DeclarationId(1252)),
+            inputs: vec![PortId(881), PortId(904)],
+            output: PortId(905),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3755, 3808),
         }));
-        nodes.push(Behavior::Branch(BranchNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(753),
-            input: PortId(902),
-            paths: vec![
-                Path {
-                    body: NodeId(751),
-                    output: PortId(906),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Cardinality".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 12829, 12843),
-                    },
-                    binding: Some(PayloadBinding {
-                        binding_name: "_".to_string(),
-                        payload_port: PortId(905),
-                    }),
-                },
-                Path {
-                    body: NodeId(752),
-                    output: PortId(908),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Descent".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 12887, 12897),
-                    },
-                    binding: Some(PayloadBinding {
-                        binding_name: "_".to_string(),
-                        payload_port: PortId(907),
-                    }),
-                },
-            ],
-            output: PortId(909),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12807, 12940),
-            emit_participation: Some(BranchEmitParticipation::UserMatch),
+            target: TransformTarget::Callable(DeclarationId(1243)),
+            inputs: vec![],
+            output: PortId(906),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3844, 3872),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(754),
-            target: TransformTarget::Callable(DeclarationId(2592)),
-            inputs: vec![],
-            output: PortId(910),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12959, 12969),
+            target: TransformTarget::Callable(DeclarationId(2697)),
+            inputs: vec![PortId(906)],
+            output: PortId(907),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3835, 3873),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(755),
-            target: TransformTarget::Callable(DeclarationId(2593)),
-            inputs: vec![],
-            output: PortId(911),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12987, 12996),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "value".to_string(),
+            },
+            inputs: vec![PortId(908)],
+            output: PortId(909),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3899, 3907),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(756),
-            target: TransformTarget::Callable(DeclarationId(2594)),
+            target: TransformTarget::Callable(DeclarationId(1243)),
             inputs: vec![],
-            output: PortId(912),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13010, 13015),
+            output: PortId(910),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3922, 3950),
         }));
-        nodes.push(Behavior::Branch(BranchNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(757),
-            input: PortId(901),
+            target: TransformTarget::Callable(DeclarationId(2698)),
+            inputs: vec![PortId(910)],
+            output: PortId(911),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3913, 3951),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(758),
+            input: PortId(905),
             paths: vec![
-                Path {
-                    body: NodeId(753),
-                    output: PortId(909),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Observed".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 12773, 12797),
-                    },
-                    binding: Some(PayloadBinding {
-                        binding_name: "_".to_string(),
-                        payload_port: PortId(903),
-                    }),
-                },
                 Path {
                     body: NodeId(754),
-                    output: PortId(910),
+                    output: PortId(907),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Unobserved".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 12945, 12955),
+                        name: "NoDiagnostic".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            3819,
+                            3831,
+                        ),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(755),
+                    body: NodeId(757),
                     output: PortId(911),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Ambiguous".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 12974, 12983),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(756),
-                    output: PortId(912),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Stale".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 13001, 13006),
+                        name: "SomeDiagnostic".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            3882,
+                            3909,
+                        ),
                     },
-                    binding: None,
+                    binding: Some(PayloadBinding {
+                        binding_name: "_".to_string(),
+                        payload_port: PortId(908),
+                    }),
                 },
             ],
-            output: PortId(913),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12756, 13019),
+            output: PortId(912),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3749, 3959),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
-        nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(758),
-            name: "timing_measurement_iterate".to_string(),
-            value: PortId(913),
-            params: vec![PortId(901), PortId(902)],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12756, 13019),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
-        }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(759),
-            target: TransformTarget::Callable(DeclarationId(1309)),
-            inputs: vec![PortId(914)],
-            output: PortId(917),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13915, 13932),
+            target: TransformTarget::Callable(DeclarationId(1243)),
+            inputs: vec![],
+            output: PortId(914),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4011, 4039),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(760),
-            target: TransformTarget::Callable(DeclarationId(711)),
-            inputs: vec![PortId(917)],
-            output: PortId(918),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13906, 13933),
+            target: TransformTarget::Callable(DeclarationId(1252)),
+            inputs: vec![PortId(881), PortId(914)],
+            output: PortId(915),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3987, 4040),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(761),
-            target: TransformTarget::Callable(DeclarationId(1246)),
+            target: TransformTarget::Callable(DeclarationId(1243)),
             inputs: vec![],
-            output: PortId(919),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13948, 13979),
+            output: PortId(916),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4076, 4104),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(762),
-            target: TransformTarget::Callable(DeclarationId(2597)),
-            inputs: vec![PortId(919)],
-            output: PortId(920),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13939, 13980),
+            target: TransformTarget::Callable(DeclarationId(2699)),
+            inputs: vec![PortId(916)],
+            output: PortId(917),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4067, 4105),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(763),
-            target: TransformTarget::Callable(DeclarationId(1246)),
-            inputs: vec![],
-            output: PortId(921),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13995, 14026),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "value".to_string(),
+            },
+            inputs: vec![PortId(918)],
+            output: PortId(919),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4131, 4139),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(764),
-            target: TransformTarget::Callable(DeclarationId(2598)),
-            inputs: vec![PortId(921)],
-            output: PortId(922),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13986, 14027),
+            target: TransformTarget::Callable(DeclarationId(1243)),
+            inputs: vec![],
+            output: PortId(920),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4154, 4182),
         }));
-        nodes.push(Behavior::Branch(BranchNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(765),
-            input: PortId(918),
+            target: TransformTarget::Callable(DeclarationId(2700)),
+            inputs: vec![PortId(920)],
+            output: PortId(921),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4145, 4183),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(766),
+            input: PortId(915),
             paths: vec![
                 Path {
                     body: NodeId(762),
-                    output: PortId(920),
+                    output: PortId(917),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "True".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 13939, 13980),
+                        name: "NoDiagnostic".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            4051,
+                            4063,
+                        ),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(764),
-                    output: PortId(922),
+                    body: NodeId(765),
+                    output: PortId(921),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "False".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 13986, 14027),
+                        name: "SomeDiagnostic".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            4114,
+                            4141,
+                        ),
                     },
-                    binding: None,
+                    binding: Some(PayloadBinding {
+                        binding_name: "_".to_string(),
+                        payload_port: PortId(918),
+                    }),
                 },
             ],
-            output: PortId(923),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13903, 14027),
-            emit_participation: None,
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(766),
-            target: TransformTarget::Callable(DeclarationId(1309)),
-            inputs: vec![PortId(914)],
-            output: PortId(925),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14066, 14083),
+            output: PortId(922),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3981, 4191),
+            emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(767),
-            target: TransformTarget::Callable(DeclarationId(711)),
-            inputs: vec![PortId(925)],
-            output: PortId(926),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14057, 14084),
+            target: TransformTarget::Callable(DeclarationId(1243)),
+            inputs: vec![],
+            output: PortId(924),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4243, 4271),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(768),
-            target: TransformTarget::Callable(DeclarationId(1246)),
-            inputs: vec![],
-            output: PortId(927),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14099, 14130),
+            target: TransformTarget::Callable(DeclarationId(1252)),
+            inputs: vec![PortId(881), PortId(924)],
+            output: PortId(925),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4219, 4272),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(769),
-            target: TransformTarget::Callable(DeclarationId(2599)),
-            inputs: vec![PortId(927)],
-            output: PortId(928),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14090, 14131),
+            target: TransformTarget::Callable(DeclarationId(1243)),
+            inputs: vec![],
+            output: PortId(926),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4308, 4336),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(770),
-            target: TransformTarget::Callable(DeclarationId(1246)),
-            inputs: vec![],
-            output: PortId(929),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14146, 14177),
+            target: TransformTarget::Callable(DeclarationId(2701)),
+            inputs: vec![PortId(926)],
+            output: PortId(927),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4299, 4337),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(771),
-            target: TransformTarget::Callable(DeclarationId(2600)),
-            inputs: vec![PortId(929)],
-            output: PortId(930),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14137, 14178),
-        }));
-        nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(772),
-            input: PortId(926),
-            paths: vec![
-                Path {
-                    body: NodeId(769),
-                    output: PortId(928),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "True".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14090, 14131),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(771),
-                    output: PortId(930),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "False".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14137, 14178),
-                    },
-                    binding: None,
-                },
-            ],
-            output: PortId(931),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14054, 14178),
-            emit_participation: None,
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(773),
-            target: TransformTarget::Callable(DeclarationId(1309)),
-            inputs: vec![PortId(914)],
-            output: PortId(933),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14214, 14231),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(774),
-            target: TransformTarget::Callable(DeclarationId(711)),
-            inputs: vec![PortId(933)],
-            output: PortId(934),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14205, 14232),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(775),
-            target: TransformTarget::Callable(DeclarationId(1246)),
-            inputs: vec![],
-            output: PortId(935),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14247, 14278),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(776),
-            target: TransformTarget::Callable(DeclarationId(2601)),
-            inputs: vec![PortId(935)],
-            output: PortId(936),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14238, 14279),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(777),
-            target: TransformTarget::Callable(DeclarationId(1246)),
-            inputs: vec![],
-            output: PortId(937),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14294, 14325),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(778),
-            target: TransformTarget::Callable(DeclarationId(2602)),
-            inputs: vec![PortId(937)],
-            output: PortId(938),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14285, 14326),
-        }));
-        nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(779),
-            input: PortId(934),
-            paths: vec![
-                Path {
-                    body: NodeId(776),
-                    output: PortId(936),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "True".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14238, 14279),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(778),
-                    output: PortId(938),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "False".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14285, 14326),
-                    },
-                    binding: None,
-                },
-            ],
-            output: PortId(939),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14202, 14326),
-            emit_participation: None,
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(780),
-            target: TransformTarget::Callable(DeclarationId(1309)),
-            inputs: vec![PortId(914)],
-            output: PortId(941),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14360, 14377),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(781),
-            target: TransformTarget::Callable(DeclarationId(711)),
-            inputs: vec![PortId(941)],
-            output: PortId(942),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14351, 14378),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(782),
-            target: TransformTarget::Callable(DeclarationId(1246)),
-            inputs: vec![],
-            output: PortId(943),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14393, 14424),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(783),
-            target: TransformTarget::Callable(DeclarationId(2603)),
-            inputs: vec![PortId(943)],
-            output: PortId(944),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14384, 14425),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(784),
-            target: TransformTarget::Callable(DeclarationId(1246)),
-            inputs: vec![],
-            output: PortId(945),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14440, 14471),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(785),
-            target: TransformTarget::Callable(DeclarationId(2604)),
-            inputs: vec![PortId(945)],
-            output: PortId(946),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14431, 14472),
-        }));
-        nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(786),
-            input: PortId(942),
-            paths: vec![
-                Path {
-                    body: NodeId(783),
-                    output: PortId(944),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "True".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14384, 14425),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(785),
-                    output: PortId(946),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "False".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14431, 14472),
-                    },
-                    binding: None,
-                },
-            ],
-            output: PortId(947),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14348, 14472),
-            emit_participation: None,
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(787),
-            target: TransformTarget::Callable(DeclarationId(1309)),
-            inputs: vec![PortId(914)],
-            output: PortId(949),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14506, 14523),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(788),
-            target: TransformTarget::Callable(DeclarationId(711)),
-            inputs: vec![PortId(949)],
-            output: PortId(950),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14497, 14524),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(789),
-            target: TransformTarget::Callable(DeclarationId(1246)),
-            inputs: vec![],
-            output: PortId(951),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14539, 14570),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(790),
-            target: TransformTarget::Callable(DeclarationId(2605)),
-            inputs: vec![PortId(951)],
-            output: PortId(952),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14530, 14571),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "value".to_string(),
+            },
+            inputs: vec![PortId(928)],
+            output: PortId(929),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4363, 4371),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(791),
-            target: TransformTarget::Callable(DeclarationId(1246)),
+            id: NodeId(772),
+            target: TransformTarget::Callable(DeclarationId(1243)),
             inputs: vec![],
-            output: PortId(953),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14586, 14617),
+            output: PortId(930),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4386, 4414),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(792),
-            target: TransformTarget::Callable(DeclarationId(2606)),
-            inputs: vec![PortId(953)],
-            output: PortId(954),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14577, 14618),
+            id: NodeId(773),
+            target: TransformTarget::Callable(DeclarationId(2702)),
+            inputs: vec![PortId(930)],
+            output: PortId(931),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4377, 4415),
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(793),
-            input: PortId(950),
+            id: NodeId(774),
+            input: PortId(925),
             paths: vec![
                 Path {
-                    body: NodeId(790),
-                    output: PortId(952),
+                    body: NodeId(770),
+                    output: PortId(927),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "True".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14530, 14571),
+                        name: "NoDiagnostic".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            4283,
+                            4295,
+                        ),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(792),
-                    output: PortId(954),
+                    body: NodeId(773),
+                    output: PortId(931),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "False".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14577, 14618),
+                        name: "SomeDiagnostic".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            4346,
+                            4373,
+                        ),
                     },
-                    binding: None,
+                    binding: Some(PayloadBinding {
+                        binding_name: "_".to_string(),
+                        payload_port: PortId(928),
+                    }),
                 },
             ],
-            output: PortId(955),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14494, 14618),
-            emit_participation: None,
+            output: PortId(932),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4213, 4423),
+            emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(794),
-            input: PortId(915),
+            id: NodeId(775),
+            input: PortId(882),
             paths: vec![
                 Path {
-                    body: NodeId(765),
-                    output: PortId(923),
+                    body: NodeId(742),
+                    output: PortId(892),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Value".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 13885, 13893),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            3260,
+                            3268,
+                        ),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "_".to_string(),
-                        payload_port: PortId(916),
+                        payload_port: PortId(883),
                     }),
                 },
                 Path {
-                    body: NodeId(772),
-                    output: PortId(931),
+                    body: NodeId(750),
+                    output: PortId(902),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Transform".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14032, 14044),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            3493,
+                            3505,
+                        ),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "_".to_string(),
-                        payload_port: PortId(924),
+                        payload_port: PortId(893),
                     }),
                 },
                 Path {
-                    body: NodeId(779),
-                    output: PortId(939),
+                    body: NodeId(758),
+                    output: PortId(912),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Branch".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14183, 14192),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            3730,
+                            3739,
+                        ),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "_".to_string(),
-                        payload_port: PortId(932),
+                        payload_port: PortId(903),
                     }),
                 },
                 Path {
-                    body: NodeId(786),
-                    output: PortId(947),
+                    body: NodeId(766),
+                    output: PortId(922),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Loop".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14331, 14338),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            3964,
+                            3971,
+                        ),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "_".to_string(),
-                        payload_port: PortId(940),
+                        payload_port: PortId(913),
                     }),
                 },
                 Path {
-                    body: NodeId(793),
-                    output: PortId(955),
+                    body: NodeId(774),
+                    output: PortId(932),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Bind".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14477, 14484),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            4196,
+                            4203,
+                        ),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "_".to_string(),
-                        payload_port: PortId(948),
+                        payload_port: PortId(923),
                     }),
                 },
             ],
-            output: PortId(956),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13871, 14622),
+            output: PortId(933),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3246, 4427),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(795),
-            name: "timing_lens_read".to_string(),
-            value: PortId(956),
-            params: vec![PortId(914), PortId(915)],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13871, 14622),
+            id: NodeId(776),
+            name: "ci_demo_timing_read".to_string(),
+            value: PortId(933),
+            params: vec![PortId(881), PortId(882)],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3246, 4427),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(796),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "duration".to_string(),
-            },
-            inputs: vec![PortId(959)],
-            output: PortId(960),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14743, 14754),
+            id: NodeId(777),
+            target: TransformTarget::Callable(DeclarationId(1261)),
+            inputs: vec![PortId(934), PortId(935)],
+            output: PortId(936),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4818, 4843),
         }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(797),
-            target: TransformTarget::Callable(DeclarationId(1309)),
-            inputs: vec![PortId(957)],
-            output: PortId(961),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14778, 14795),
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(778),
+            name: "ci_wad_modeled_workflow_timing_witness".to_string(),
+            value: PortId(936),
+            params: vec![PortId(934), PortId(935)],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4818, 4843),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(798),
-            target: TransformTarget::Callable(DeclarationId(711)),
-            inputs: vec![PortId(961)],
-            output: PortId(962),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14769, 14796),
+            id: NodeId(779),
+            target: TransformTarget::Callable(DeclarationId(2703)),
+            inputs: vec![],
+            output: PortId(937),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5101, 5106),
+        }));
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(780),
+            name: "_ci_wad_seed_list_declaration_empty".to_string(),
+            value: PortId(937),
+            params: vec![],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5101, 5106),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(799),
-            target: TransformTarget::Callable(DeclarationId(2309)),
+            id: NodeId(781),
+            target: TransformTarget::Callable(DeclarationId(2704)),
             inputs: vec![],
-            output: PortId(963),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14802, 14814),
+            output: PortId(938),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5166, 5171),
+        }));
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(782),
+            name: "_ci_wad_seed_list_behavior_empty".to_string(),
+            value: PortId(938),
+            params: vec![],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5166, 5171),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(800),
-            target: TransformTarget::Callable(DeclarationId(2309)),
+            id: NodeId(783),
+            target: TransformTarget::Callable(DeclarationId(2705)),
             inputs: vec![],
-            output: PortId(964),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14820, 14832),
+            output: PortId(939),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5229, 5234),
         }));
-        nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(801),
-            input: PortId(962),
-            paths: vec![
-                Path {
-                    body: NodeId(799),
-                    output: PortId(963),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "True".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14802, 14814),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(800),
-                    output: PortId(964),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "False".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14820, 14832),
-                    },
-                    binding: None,
-                },
-            ],
-            output: PortId(965),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14766, 14832),
-            emit_participation: None,
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(784),
+            name: "_ci_wad_seed_list_dagport_empty".to_string(),
+            value: PortId(939),
+            params: vec![],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5229, 5234),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
-        nodes.push(Behavior::Value(ValueNode { id: NodeId(802), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Unobserved is not admissible evidence at this scaffold (missing external timing row).".to_string()), output: PortId(966), span: SourceSpan::new("src/v3/std/timing_lens.dag", 14911, 15038), lane2_workflow: None }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(803),
-            target: TransformTarget::Callable(DeclarationId(1256)),
-            inputs: vec![PortId(957), PortId(966)],
-            output: PortId(967),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14857, 15046),
+            id: NodeId(785),
+            target: TransformTarget::Callable(DeclarationId(2706)),
+            inputs: vec![],
+            output: PortId(940),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5292, 5297),
         }));
-        nodes.push(Behavior::Value(ValueNode { id: NodeId(804), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Ambiguous is not admissible evidence at this scaffold (conflicting timing facts).".to_string()), output: PortId(968), span: SourceSpan::new("src/v3/std/timing_lens.dag", 15124, 15247), lane2_workflow: None }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(805),
-            target: TransformTarget::Callable(DeclarationId(1256)),
-            inputs: vec![PortId(957), PortId(968)],
-            output: PortId(969),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15070, 15255),
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(786),
+            name: "_ci_wad_seed_list_cluster_empty".to_string(),
+            value: PortId(940),
+            params: vec![],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5292, 5297),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
-        nodes.push(Behavior::Value(ValueNode { id: NodeId(806), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Stale is not admissible evidence at this scaffold (digest/run mismatch vs attachment).".to_string()), output: PortId(970), span: SourceSpan::new("src/v3/std/timing_lens.dag", 15329, 15457), lane2_workflow: None }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(807),
-            target: TransformTarget::Callable(DeclarationId(1256)),
-            inputs: vec![PortId(957), PortId(970)],
-            output: PortId(971),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15275, 15465),
-        }));
-        nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(808),
-            input: PortId(958),
-            paths: vec![
-                Path {
-                    body: NodeId(801),
-                    output: PortId(965),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Observed".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14732, 14756),
-                    },
-                    binding: Some(PayloadBinding {
-                        binding_name: "_".to_string(),
-                        payload_port: PortId(959),
-                    }),
-                },
-                Path {
-                    body: NodeId(803),
-                    output: PortId(967),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Unobserved".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14837, 14847),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(805),
-                    output: PortId(969),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Ambiguous".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15051, 15060),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(807),
-                    output: PortId(971),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Stale".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15260, 15265),
-                    },
-                    binding: None,
-                },
-            ],
-            output: PortId(972),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14711, 15469),
-            emit_participation: Some(BranchEmitParticipation::UserMatch),
+            id: NodeId(787),
+            target: TransformTarget::Callable(DeclarationId(2707)),
+            inputs: vec![],
+            output: PortId(941),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5356, 5361),
         }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(809),
-            name: "timing_lens_validate".to_string(),
-            value: PortId(972),
-            params: vec![PortId(957), PortId(958)],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14711, 15469),
+            id: NodeId(788),
+            name: "_ci_wad_empty_list_diagnostic".to_string(),
+            value: PortId(941),
+            params: vec![],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5356, 5361),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(810),
-            target: TransformTarget::Callable(DeclarationId(1305)),
-            inputs: vec![PortId(974)],
-            output: PortId(975),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28552, 28575),
+            id: NodeId(789),
+            target: TransformTarget::Callable(DeclarationId(2708)),
+            inputs: vec![],
+            output: PortId(942),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5436, 5441),
+        }));
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(790),
+            name: "_ci_wad_empty_list_witness_tm".to_string(),
+            value: PortId(942),
+            params: vec![],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5436, 5441),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(791),
+            target: TransformTarget::Callable(DeclarationId(2710)),
+            inputs: vec![PortId(943)],
+            output: PortId(944),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5552, 5563),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(792),
+            target: TransformTarget::Callable(DeclarationId(1268)),
+            inputs: vec![],
+            output: PortId(945),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5571, 5602),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(793),
+            target: TransformTarget::Callable(DeclarationId(2709)),
+            inputs: vec![PortId(944), PortId(945)],
+            output: PortId(946),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5539, 5604),
+        }));
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(794),
+            name: "_ci_wad_witnesses_singleton_tm".to_string(),
+            value: PortId(946),
+            params: vec![PortId(943)],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5539, 5604),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(795),
+            target: TransformTarget::Callable(DeclarationId(1267)),
+            inputs: vec![],
+            output: PortId(948),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5705, 5736),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(796),
+            target: TransformTarget::Callable(DeclarationId(2711)),
+            inputs: vec![PortId(947), PortId(948)],
+            output: PortId(949),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5680, 5738),
+        }));
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(797),
+            name: "_ci_wad_violations_singleton".to_string(),
+            value: PortId(949),
+            params: vec![PortId(947)],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5680, 5738),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
+        }));
+        nodes.push(Behavior::Value(ValueNode {
+            id: NodeId(798),
+            data: LiteralBits::String("ci_modeled_timing".to_string()),
+            output: PortId(951),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5873, 5892),
+            lane2_workflow: None,
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(799),
+            target: TransformTarget::Callable(DeclarationId(1269)),
+            inputs: vec![PortId(950)],
+            output: PortId(952),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5926, 5959),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(800),
+            target: TransformTarget::Callable(DeclarationId(2712)),
+            inputs: vec![PortId(951), PortId(950), PortId(952)],
+            output: PortId(953),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5839, 5964),
+        }));
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(801),
+            name: "_ci_wad_dimension_ok_tm_payload".to_string(),
+            value: PortId(953),
+            params: vec![PortId(950)],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5839, 5964),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
+        }));
+        nodes.push(Behavior::Value(ValueNode {
+            id: NodeId(802),
+            data: LiteralBits::String("ci_modeled_timing".to_string()),
+            output: PortId(956),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6121, 6140),
+            lane2_workflow: None,
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(803),
+            target: TransformTarget::Callable(DeclarationId(1270)),
+            inputs: vec![PortId(955)],
+            output: PortId(957),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6158, 6192),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(804),
+            target: TransformTarget::Callable(DeclarationId(1269)),
+            inputs: vec![PortId(954)],
+            output: PortId(958),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6209, 6242),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(805),
+            target: TransformTarget::Callable(DeclarationId(2713)),
+            inputs: vec![PortId(956), PortId(957), PortId(958)],
+            output: PortId(959),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6085, 6247),
+        }));
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(806),
+            name: "_ci_wad_dimension_fail_tm_payload".to_string(),
+            value: PortId(959),
+            params: vec![PortId(954), PortId(955)],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6085, 6247),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(807),
+            target: TransformTarget::Callable(DeclarationId(1227)),
+            inputs: vec![PortId(960)],
+            output: PortId(962),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6610, 6627),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(808),
+            target: TransformTarget::Callable(DeclarationId(1271)),
+            inputs: vec![PortId(961)],
+            output: PortId(963),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6643, 6677),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(809),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "head".to_string(),
+            },
+            inputs: vec![PortId(964)],
+            output: PortId(965),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6689, 6697),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(810),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "tail".to_string(),
+            },
+            inputs: vec![PortId(964)],
+            output: PortId(966),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6699, 6707),
         }));
         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", 28597, 28631),
+            target: TransformTarget::Callable(DeclarationId(1271)),
+            inputs: vec![PortId(961)],
+            output: PortId(967),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6713, 6747),
         }));
         nodes.push(Behavior::Branch(BranchNode {
             id: NodeId(812),
-            input: PortId(973),
+            input: PortId(962),
             paths: vec![
                 Path {
-                    body: NodeId(810),
-                    output: PortId(975),
+                    body: NodeId(808),
+                    output: PortId(963),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Enumerated".to_string(),
-                        span: SourceSpan::new("src/v3/std/verification.dag", 28535, 28548),
+                        name: "Empty".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            6634,
+                            6639,
+                        ),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(811),
+                    output: PortId(967),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Cons".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            6682,
+                            6709,
+                        ),
                     },
                     binding: Some(PayloadBinding {
-                        binding_name: "c".to_string(),
-                        payload_port: PortId(974),
+                        binding_name: "__payload_6682_6709".to_string(),
+                        payload_port: PortId(964),
                     }),
                 },
+            ],
+            output: PortId(968),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6604, 6751),
+            emit_participation: Some(BranchEmitParticipation::UserMatch),
+        }));
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(813),
+            name: "report_dim_ok_tm".to_string(),
+            value: PortId(968),
+            params: vec![PortId(960), PortId(961)],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6604, 6751),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(814),
+            target: TransformTarget::Callable(DeclarationId(1227)),
+            inputs: vec![PortId(969)],
+            output: PortId(972),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6871, 6888),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(815),
+            target: TransformTarget::Callable(DeclarationId(1272)),
+            inputs: vec![PortId(970), PortId(971)],
+            output: PortId(973),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6904, 6946),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(816),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "head".to_string(),
+            },
+            inputs: vec![PortId(974)],
+            output: PortId(975),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6958, 6966),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(817),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "tail".to_string(),
+            },
+            inputs: vec![PortId(974)],
+            output: PortId(976),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6968, 6976),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(818),
+            target: TransformTarget::Callable(DeclarationId(1272)),
+            inputs: vec![PortId(970), PortId(971)],
+            output: PortId(977),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6982, 7024),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(819),
+            input: PortId(972),
+            paths: vec![
+                Path {
+                    body: NodeId(815),
+                    output: PortId(973),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Empty".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            6895,
+                            6900,
+                        ),
+                    },
+                    binding: None,
+                },
                 Path {
-                    body: NodeId(811),
+                    body: NodeId(818),
                     output: PortId(977),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Quantified".to_string(),
-                        span: SourceSpan::new("src/v3/std/verification.dag", 28580, 28593),
+                        name: "Cons".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            6951,
+                            6978,
+                        ),
                     },
                     binding: Some(PayloadBinding {
-                        binding_name: "q".to_string(),
-                        payload_port: PortId(976),
+                        binding_name: "__payload_6951_6978".to_string(),
+                        payload_port: PortId(974),
                     }),
                 },
             ],
             output: PortId(978),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28517, 28635),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6865, 7028),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(813),
-            name: "obligation_for_suite_claim".to_string(),
+            id: NodeId(820),
+            name: "report_dim_fail_tm".to_string(),
             value: PortId(978),
-            params: vec![PortId(973)],
-            span: SourceSpan::new("src/v3/std/verification.dag", 28517, 28635),
+            params: vec![PortId(969), PortId(970), PortId(971)],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6865, 7028),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(814),
-            target: TransformTarget::ResolvedFieldProject {
-                field_label: "nodes".to_string(),
+            id: NodeId(821),
+            target: TransformTarget::Callable(DeclarationId(1273)),
+            inputs: vec![PortId(979), PortId(980)],
+            output: PortId(982),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7186, 7208),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(822),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "value".to_string(),
             },
-            inputs: vec![PortId(979)],
-            output: PortId(980),
-            span: SourceSpan::new("src/v3/std/workflows.dag", 1013, 1018),
+            inputs: vec![PortId(983)],
+            output: PortId(984),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7230, 7241),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(823),
+            target: TransformTarget::Callable(DeclarationId(1274)),
+            inputs: vec![PortId(979), PortId(980), PortId(984)],
+            output: PortId(985),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7247, 7277),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(824),
+            input: PortId(981),
+            paths: vec![
+                Path {
+                    body: NodeId(821),
+                    output: PortId(982),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "NoDiagnostic".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            7170,
+                            7182,
+                        ),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(823),
+                    output: PortId(985),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "SomeDiagnostic".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            7213,
+                            7243,
+                        ),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "diag".to_string(),
+                        payload_port: PortId(983),
+                    }),
+                },
+            ],
+            output: PortId(986),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7155, 7281),
+            emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(815),
-            name: "behavior_spine".to_string(),
-            value: PortId(980),
-            params: vec![PortId(979)],
-            span: SourceSpan::new("src/v3/std/workflows.dag", 1011, 1018),
+            id: NodeId(825),
+            name: "report_inhabits_branch_tm".to_string(),
+            value: PortId(986),
+            params: vec![PortId(979), PortId(980), PortId(981)],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7155, 7281),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(826),
+            target: TransformTarget::Callable(DeclarationId(1252)),
+            inputs: vec![PortId(987), PortId(989)],
+            output: PortId(990),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7461, 7487),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(827),
+            target: TransformTarget::Callable(DeclarationId(1275)),
+            inputs: vec![PortId(987), PortId(989), PortId(990)],
+            output: PortId(991),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7429, 7488),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(828),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "reason".to_string(),
+            },
+            inputs: vec![PortId(992)],
+            output: PortId(993),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7504, 7513),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(829),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "at".to_string(),
+            },
+            inputs: vec![PortId(992)],
+            output: PortId(994),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7515, 7522),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(830),
+            target: TransformTarget::Callable(DeclarationId(1243)),
+            inputs: vec![],
+            output: PortId(995),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7573, 7601),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(831),
+            target: TransformTarget::Callable(DeclarationId(1246)),
+            inputs: vec![PortId(994)],
+            output: PortId(996),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7659, 7689),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(832),
+            target: TransformTarget::Callable(DeclarationId(1247)),
+            inputs: vec![PortId(993), PortId(996)],
+            output: PortId(997),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7611, 7690),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(833),
+            target: TransformTarget::Callable(DeclarationId(1274)),
+            inputs: vec![PortId(987), PortId(995), PortId(997)],
+            output: PortId(998),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7534, 7698),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(834),
+            input: PortId(988),
+            paths: vec![
+                Path {
+                    body: NodeId(827),
+                    output: PortId(991),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Inhabits".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            7414,
+                            7425,
+                        ),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "c".to_string(),
+                        payload_port: PortId(989),
+                    }),
+                },
+                Path {
+                    body: NodeId(833),
+                    output: PortId(998),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Violates".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            7493,
+                            7524,
+                        ),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "__payload_7493_7524".to_string(),
+                        payload_port: PortId(992),
+                    }),
+                },
+            ],
+            output: PortId(999),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7400, 7702),
+            emit_participation: Some(BranchEmitParticipation::UserMatch),
+        }));
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(835),
+            name: "dimension_report_tm_from_witness".to_string(),
+            value: PortId(999),
+            params: vec![PortId(987), PortId(988)],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7400, 7702),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(836),
+            target: TransformTarget::Callable(DeclarationId(1227)),
+            inputs: vec![PortId(1000)],
+            output: PortId(1002),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8681, 8698),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(837),
+            target: TransformTarget::Callable(DeclarationId(711)),
+            inputs: vec![PortId(1002)],
+            output: PortId(1003),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8672, 8699),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(838),
+            target: TransformTarget::Callable(DeclarationId(1261)),
+            inputs: vec![PortId(1000), PortId(1001)],
+            output: PortId(1004),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8745, 8770),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(839),
+            target: TransformTarget::Callable(DeclarationId(1276)),
+            inputs: vec![PortId(1000), PortId(1004)],
+            output: PortId(1005),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8709, 8771),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(840),
+            target: TransformTarget::Callable(DeclarationId(1262)),
+            inputs: vec![PortId(1000), PortId(1001)],
+            output: PortId(1006),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8819, 8863),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(841),
+            target: TransformTarget::Callable(DeclarationId(1276)),
+            inputs: vec![PortId(1000), PortId(1006)],
+            output: PortId(1007),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8783, 8864),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(842),
+            input: PortId(1003),
+            paths: vec![
+                Path {
+                    body: NodeId(839),
+                    output: PortId(1005),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "True".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            8709,
+                            8771,
+                        ),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(841),
+                    output: PortId(1007),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "False".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            8783,
+                            8864,
+                        ),
+                    },
+                    binding: None,
+                },
+            ],
+            output: PortId(1008),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8669, 8864),
+            emit_participation: None,
+        }));
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(843),
+            name: "demo_ci_modeled_timing_dimension_report".to_string(),
+            value: PortId(1008),
+            params: vec![PortId(1000), PortId(1001)],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8669, 8864),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(844),
+            target: TransformTarget::Callable(DeclarationId(1320)),
+            inputs: vec![PortId(1010)],
+            output: PortId(1011),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28552, 28575),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(845),
+            target: TransformTarget::Callable(DeclarationId(1321)),
+            inputs: vec![PortId(1012)],
+            output: PortId(1013),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28597, 28631),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(846),
+            input: PortId(1009),
+            paths: vec![
+                Path {
+                    body: NodeId(844),
+                    output: PortId(1011),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Enumerated".to_string(),
+                        span: SourceSpan::new("src/v3/std/verification.dag", 28535, 28548),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "c".to_string(),
+                        payload_port: PortId(1010),
+                    }),
+                },
+                Path {
+                    body: NodeId(845),
+                    output: PortId(1013),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Quantified".to_string(),
+                        span: SourceSpan::new("src/v3/std/verification.dag", 28580, 28593),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "q".to_string(),
+                        payload_port: PortId(1012),
+                    }),
+                },
+            ],
+            output: PortId(1014),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28517, 28635),
+            emit_participation: Some(BranchEmitParticipation::UserMatch),
+        }));
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(847),
+            name: "obligation_for_suite_claim".to_string(),
+            value: PortId(1014),
+            params: vec![PortId(1009)],
+            span: SourceSpan::new("src/v3/std/verification.dag", 28517, 28635),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(816),
+            id: NodeId(848),
             data: LiteralBits::String("+".to_string()),
-            output: PortId(983),
+            output: PortId(1017),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 886, 889),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(817),
+            id: NodeId(849),
             data: LiteralBits::String("-".to_string()),
-            output: PortId(984),
+            output: PortId(1018),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 905, 908),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(818),
+            id: NodeId(850),
             data: LiteralBits::String("*".to_string()),
-            output: PortId(985),
+            output: PortId(1019),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 924, 927),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(819),
+            id: NodeId(851),
             data: LiteralBits::String("/".to_string()),
-            output: PortId(986),
+            output: PortId(1020),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 943, 946),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(820),
-            input: PortId(982),
+            id: NodeId(852),
+            input: PortId(1016),
             paths: vec![
                 Path {
-                    body: NodeId(816),
-                    output: PortId(983),
+                    body: NodeId(848),
+                    output: PortId(1017),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Add".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 879, 882),
@@ -9307,8 +9649,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(817),
-                    output: PortId(984),
+                    body: NodeId(849),
+                    output: PortId(1018),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Sub".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 898, 901),
@@ -9316,8 +9658,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(818),
-                    output: PortId(985),
+                    body: NodeId(850),
+                    output: PortId(1019),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Mul".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 917, 920),
@@ -9325,8 +9667,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(819),
-                    output: PortId(986),
+                    body: NodeId(851),
+                    output: PortId(1020),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Div".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 936, 939),
@@ -9334,59 +9676,59 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
             ],
-            output: PortId(987),
+            output: PortId(1021),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 857, 954),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(821),
+            id: NodeId(853),
             data: LiteralBits::String("==".to_string()),
-            output: PortId(989),
+            output: PortId(1023),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1012, 1016),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(822),
+            id: NodeId(854),
             data: LiteralBits::String("!=".to_string()),
-            output: PortId(990),
+            output: PortId(1024),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1031, 1035),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(823),
+            id: NodeId(855),
             data: LiteralBits::String("<".to_string()),
-            output: PortId(991),
+            output: PortId(1025),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1050, 1053),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(824),
+            id: NodeId(856),
             data: LiteralBits::String("<=".to_string()),
-            output: PortId(992),
+            output: PortId(1026),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1068, 1072),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(825),
+            id: NodeId(857),
             data: LiteralBits::String(">".to_string()),
-            output: PortId(993),
+            output: PortId(1027),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1087, 1090),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(826),
+            id: NodeId(858),
             data: LiteralBits::String(">=".to_string()),
-            output: PortId(994),
+            output: PortId(1028),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1105, 1109),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(827),
-            input: PortId(988),
+            id: NodeId(859),
+            input: PortId(1022),
             paths: vec![
                 Path {
-                    body: NodeId(821),
-                    output: PortId(989),
+                    body: NodeId(853),
+                    output: PortId(1023),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Eq".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1006, 1008),
@@ -9394,8 +9736,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(822),
-                    output: PortId(990),
+                    body: NodeId(854),
+                    output: PortId(1024),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Ne".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1025, 1027),
@@ -9403,8 +9745,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(823),
-                    output: PortId(991),
+                    body: NodeId(855),
+                    output: PortId(1025),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Lt".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1044, 1046),
@@ -9412,8 +9754,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(824),
-                    output: PortId(992),
+                    body: NodeId(856),
+                    output: PortId(1026),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Le".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1062, 1064),
@@ -9421,8 +9763,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(825),
-                    output: PortId(993),
+                    body: NodeId(857),
+                    output: PortId(1027),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Gt".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1081, 1083),
@@ -9430,8 +9772,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(826),
-                    output: PortId(994),
+                    body: NodeId(858),
+                    output: PortId(1028),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Ge".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1099, 1101),
@@ -9439,31 +9781,31 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
             ],
-            output: PortId(995),
+            output: PortId(1029),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 985, 1117),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(828),
+            id: NodeId(860),
             data: LiteralBits::String("&&".to_string()),
-            output: PortId(997),
+            output: PortId(1031),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1179, 1183),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(829),
+            id: NodeId(861),
             data: LiteralBits::String("||".to_string()),
-            output: PortId(998),
+            output: PortId(1032),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1198, 1202),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(830),
-            input: PortId(996),
+            id: NodeId(862),
+            input: PortId(1030),
             paths: vec![
                 Path {
-                    body: NodeId(828),
-                    output: PortId(997),
+                    body: NodeId(860),
+                    output: PortId(1031),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "And".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1172, 1175),
@@ -9471,8 +9813,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(829),
-                    output: PortId(998),
+                    body: NodeId(861),
+                    output: PortId(1032),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Or".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1192, 1194),
@@ -9480,99 +9822,99 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
             ],
-            output: PortId(999),
+            output: PortId(1033),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1148, 1210),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(831),
-            input: PortId(981),
+            id: NodeId(863),
+            input: PortId(1015),
             paths: vec![
                 Path {
-                    body: NodeId(820),
-                    output: PortId(987),
+                    body: NodeId(852),
+                    output: PortId(1021),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Arithmetic".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 830, 847),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "arith".to_string(),
-                        payload_port: PortId(982),
+                        payload_port: PortId(1016),
                     }),
                 },
                 Path {
-                    body: NodeId(827),
-                    output: PortId(995),
+                    body: NodeId(859),
+                    output: PortId(1029),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Comparison".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 959, 975),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "comp".to_string(),
-                        payload_port: PortId(988),
+                        payload_port: PortId(1022),
                     }),
                 },
                 Path {
-                    body: NodeId(830),
-                    output: PortId(999),
+                    body: NodeId(862),
+                    output: PortId(1033),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Logical".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1122, 1138),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "logical".to_string(),
-                        payload_port: PortId(996),
+                        payload_port: PortId(1030),
                     }),
                 },
             ],
-            output: PortId(1000),
+            output: PortId(1034),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 815, 1214),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(832),
+            id: NodeId(864),
             name: "symbol".to_string(),
-            value: PortId(1000),
-            params: vec![PortId(981)],
+            value: PortId(1034),
+            params: vec![PortId(1015)],
             span: SourceSpan::new("src/v3/compiler/operators.dag", 815, 1214),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(833),
+            id: NodeId(865),
             data: LiteralBits::String("add".to_string()),
-            output: PortId(1003),
+            output: PortId(1037),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1341, 1346),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(834),
+            id: NodeId(866),
             data: LiteralBits::String("sub".to_string()),
-            output: PortId(1004),
+            output: PortId(1038),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1362, 1367),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(835),
+            id: NodeId(867),
             data: LiteralBits::String("mul".to_string()),
-            output: PortId(1005),
+            output: PortId(1039),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1383, 1388),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(836),
+            id: NodeId(868),
             data: LiteralBits::String("div".to_string()),
-            output: PortId(1006),
+            output: PortId(1040),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1404, 1409),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(837),
-            input: PortId(1002),
+            id: NodeId(869),
+            input: PortId(1036),
             paths: vec![
                 Path {
-                    body: NodeId(833),
-                    output: PortId(1003),
+                    body: NodeId(865),
+                    output: PortId(1037),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Add".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1334, 1337),
@@ -9580,8 +9922,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(834),
-                    output: PortId(1004),
+                    body: NodeId(866),
+                    output: PortId(1038),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Sub".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1355, 1358),
@@ -9589,8 +9931,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(835),
-                    output: PortId(1005),
+                    body: NodeId(867),
+                    output: PortId(1039),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Mul".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1376, 1379),
@@ -9598,8 +9940,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(836),
-                    output: PortId(1006),
+                    body: NodeId(868),
+                    output: PortId(1040),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Div".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1397, 1400),
@@ -9607,59 +9949,59 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
             ],
-            output: PortId(1007),
+            output: PortId(1041),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1312, 1417),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(838),
+            id: NodeId(870),
             data: LiteralBits::String("eq".to_string()),
-            output: PortId(1009),
+            output: PortId(1043),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1475, 1479),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(839),
+            id: NodeId(871),
             data: LiteralBits::String("ne".to_string()),
-            output: PortId(1010),
+            output: PortId(1044),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1494, 1498),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(840),
+            id: NodeId(872),
             data: LiteralBits::String("lt".to_string()),
-            output: PortId(1011),
+            output: PortId(1045),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1513, 1517),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(841),
+            id: NodeId(873),
             data: LiteralBits::String("le".to_string()),
-            output: PortId(1012),
+            output: PortId(1046),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1532, 1536),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(842),
+            id: NodeId(874),
             data: LiteralBits::String("gt".to_string()),
-            output: PortId(1013),
+            output: PortId(1047),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1551, 1555),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(843),
+            id: NodeId(875),
             data: LiteralBits::String("ge".to_string()),
-            output: PortId(1014),
+            output: PortId(1048),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1570, 1574),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(844),
-            input: PortId(1008),
+            id: NodeId(876),
+            input: PortId(1042),
             paths: vec![
                 Path {
-                    body: NodeId(838),
-                    output: PortId(1009),
+                    body: NodeId(870),
+                    output: PortId(1043),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Eq".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1469, 1471),
@@ -9667,8 +10009,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(839),
-                    output: PortId(1010),
+                    body: NodeId(871),
+                    output: PortId(1044),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Ne".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1488, 1490),
@@ -9676,8 +10018,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(840),
-                    output: PortId(1011),
+                    body: NodeId(872),
+                    output: PortId(1045),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Lt".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1507, 1509),
@@ -9685,8 +10027,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(841),
-                    output: PortId(1012),
+                    body: NodeId(873),
+                    output: PortId(1046),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Le".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1526, 1528),
@@ -9694,8 +10036,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(842),
-                    output: PortId(1013),
+                    body: NodeId(874),
+                    output: PortId(1047),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Gt".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1545, 1547),
@@ -9703,8 +10045,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(843),
-                    output: PortId(1014),
+                    body: NodeId(875),
+                    output: PortId(1048),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Ge".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1564, 1566),
@@ -9712,31 +10054,31 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
             ],
-            output: PortId(1015),
+            output: PortId(1049),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1448, 1582),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(845),
+            id: NodeId(877),
             data: LiteralBits::String("meet".to_string()),
-            output: PortId(1017),
+            output: PortId(1051),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1978, 1984),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(846),
+            id: NodeId(878),
             data: LiteralBits::String("join".to_string()),
-            output: PortId(1018),
+            output: PortId(1052),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1999, 2005),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(847),
-            input: PortId(1016),
+            id: NodeId(879),
+            input: PortId(1050),
             paths: vec![
                 Path {
-                    body: NodeId(845),
-                    output: PortId(1017),
+                    body: NodeId(877),
+                    output: PortId(1051),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "And".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1971, 1974),
@@ -9744,8 +10086,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(846),
-                    output: PortId(1018),
+                    body: NodeId(878),
+                    output: PortId(1052),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Or".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1993, 1995),
@@ -9753,104 +10095,104 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
             ],
-            output: PortId(1019),
+            output: PortId(1053),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1947, 2013),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(848),
-            input: PortId(1001),
+            id: NodeId(880),
+            input: PortId(1035),
             paths: vec![
                 Path {
-                    body: NodeId(837),
-                    output: PortId(1007),
+                    body: NodeId(869),
+                    output: PortId(1041),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Arithmetic".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1285, 1302),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "arith".to_string(),
-                        payload_port: PortId(1002),
+                        payload_port: PortId(1036),
                     }),
                 },
                 Path {
-                    body: NodeId(844),
-                    output: PortId(1015),
+                    body: NodeId(876),
+                    output: PortId(1049),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Comparison".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1422, 1438),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "comp".to_string(),
-                        payload_port: PortId(1008),
+                        payload_port: PortId(1042),
                     }),
                 },
                 Path {
-                    body: NodeId(847),
-                    output: PortId(1019),
+                    body: NodeId(879),
+                    output: PortId(1053),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Logical".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1921, 1937),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "logical".to_string(),
-                        payload_port: PortId(1016),
+                        payload_port: PortId(1050),
                     }),
                 },
             ],
-            output: PortId(1020),
+            output: PortId(1054),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1270, 2017),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(849),
+            id: NodeId(881),
             name: "algebra_field_name".to_string(),
-            value: PortId(1020),
-            params: vec![PortId(1001)],
+            value: PortId(1054),
+            params: vec![PortId(1035)],
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1270, 2017),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(850),
+            id: NodeId(882),
             target: TransformTarget::Operator(OperatorKind::Comparison(ComparisonOp::Eq)),
-            inputs: vec![PortId(1021), PortId(1021)],
-            output: PortId(1022),
+            inputs: vec![PortId(1055), PortId(1055)],
+            output: PortId(1056),
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2673, 2714),
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(851),
+            id: NodeId(883),
             data: LiteralBits::String("GitHubActionsWorkflowStemSegment".to_string()),
-            output: PortId(1023),
+            output: PortId(1057),
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2673, 2714),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(852),
+            id: NodeId(884),
             data: LiteralBits::String("GitHubActionsWorkflowStemSegment".to_string()),
-            output: PortId(1024),
+            output: PortId(1058),
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2673, 2714),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(853),
+            id: NodeId(885),
             target: TransformTarget::Operator(OperatorKind::Comparison(ComparisonOp::Eq)),
-            inputs: vec![PortId(1023), PortId(1024)],
-            output: PortId(1025),
+            inputs: vec![PortId(1057), PortId(1058)],
+            output: PortId(1059),
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2673, 2714),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(854),
+            id: NodeId(886),
             target: TransformTarget::Operator(OperatorKind::Logical(LogicalOp::And)),
-            inputs: vec![PortId(1022), PortId(1025)],
-            output: PortId(1026),
+            inputs: vec![PortId(1056), PortId(1059)],
+            output: PortId(1060),
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2673, 2714),
         }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(855),
+            id: NodeId(887),
             name: "<registry-refinement:GitHubActionsWorkflowStemSegment>".to_string(),
-            value: PortId(1026),
-            params: vec![PortId(1021)],
+            value: PortId(1060),
+            params: vec![PortId(1055)],
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2673, 2714),
             lane2_workflow: None,
             emit_participation: None,
@@ -9862,7 +10204,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(3353);
+        let mut declarations = Vec::with_capacity(3373);
         declarations.push(Declaration {
             id: DeclarationId(0),
             name: Some("Classical".to_string()),
@@ -24070,11 +24412,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Empty".to_string(),
-                        ty: DeclarationId(1819),
+                        ty: DeclarationId(1833),
                     },
                     Field {
                         label: "Cons".to_string(),
-                        ty: DeclarationId(1821),
+                        ty: DeclarationId(1835),
                     },
                 ],
             },
@@ -24107,7 +24449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1789),
+                output: DeclarationId(1803),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3273, 3284)),
             },
             type_params: vec![DeclarationId(688)],
@@ -24138,8 +24480,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(689),
             name: Some("cons".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(690), DeclarationId(1790)],
-                output: DeclarationId(1791),
+                inputs: vec![DeclarationId(690), DeclarationId(1804)],
+                output: DeclarationId(1805),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3453, 3475)),
             },
             type_params: vec![DeclarationId(690)],
@@ -24171,7 +24513,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("singleton".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(692)],
-                output: DeclarationId(1792),
+                output: DeclarationId(1806),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3570, 3590)),
             },
             type_params: vec![DeclarationId(692)],
@@ -24202,7 +24544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(693),
             name: Some("fold".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1793), DeclarationId(695), DeclarationId(1794)],
+                inputs: vec![DeclarationId(1807), DeclarationId(695), DeclarationId(1808)],
                 output: DeclarationId(695),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4203, 4307)),
             },
@@ -24248,7 +24590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(696),
             name: Some("fold_right".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1795), DeclarationId(698), DeclarationId(1796)],
+                inputs: vec![DeclarationId(1809), DeclarationId(698), DeclarationId(1810)],
                 output: DeclarationId(698),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4658, 4768)),
             },
@@ -24294,8 +24636,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(699),
             name: Some("concat".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1797), DeclarationId(1798)],
-                output: DeclarationId(1799),
+                inputs: vec![DeclarationId(1811), DeclarationId(1812)],
+                output: DeclarationId(1813),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5386, 5414)),
             },
             type_params: vec![DeclarationId(700)],
@@ -24326,8 +24668,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(701),
             name: Some("map".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1800), DeclarationId(1801)],
-                output: DeclarationId(1802),
+                inputs: vec![DeclarationId(1814), DeclarationId(1815)],
+                output: DeclarationId(1816),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5721, 5778)),
             },
             type_params: vec![DeclarationId(702), DeclarationId(703)],
@@ -24372,8 +24714,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(704),
             name: Some("filter".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1803), DeclarationId(1804)],
-                output: DeclarationId(1805),
+                inputs: vec![DeclarationId(1817), DeclarationId(1818)],
+                output: DeclarationId(1819),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5905, 5988)),
             },
             type_params: vec![DeclarationId(705)],
@@ -24404,8 +24746,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(706),
             name: Some("flat_map".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1806), DeclarationId(1808)],
-                output: DeclarationId(1809),
+                inputs: vec![DeclarationId(1820), DeclarationId(1822)],
+                output: DeclarationId(1823),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6171, 6230)),
             },
             type_params: vec![DeclarationId(707), DeclarationId(708)],
@@ -24450,7 +24792,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(709),
             name: Some("length".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1810)],
+                inputs: vec![DeclarationId(1824)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6372, 6409)),
             },
@@ -24482,7 +24824,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(711),
             name: Some("is_empty".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1811)],
+                inputs: vec![DeclarationId(1825)],
                 output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6605, 6671)),
             },
@@ -24553,8 +24895,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(715),
             name: Some("enumerate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1812)],
-                output: DeclarationId(1814),
+                inputs: vec![DeclarationId(1826)],
+                output: DeclarationId(1828),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7238, 7269)),
             },
             type_params: vec![DeclarationId(716)],
@@ -24585,8 +24927,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(717),
             name: Some("enumerate_helper".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1815), DeclarationId(93)],
-                output: DeclarationId(1817),
+                inputs: vec![DeclarationId(1829), DeclarationId(93)],
+                output: DeclarationId(1831),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7463, 7644)),
             },
             type_params: vec![DeclarationId(718)],
@@ -24617,7 +24959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(719),
             name: Some("contains".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1818), DeclarationId(720)],
+                inputs: vec![DeclarationId(1832), DeclarationId(720)],
                 output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 8205, 8332)),
             },
@@ -24712,7 +25054,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1822),
+                        ty: DeclarationId(1836),
                     },
                 ],
             },
@@ -24755,7 +25097,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1823),
+                        ty: DeclarationId(1837),
                     },
                 ],
             },
@@ -24790,11 +25132,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LiteralToken".to_string(),
-                        ty: DeclarationId(1838),
+                        ty: DeclarationId(1852),
                     },
                     Field {
                         label: "ParamToken".to_string(),
-                        ty: DeclarationId(1839),
+                        ty: DeclarationId(1853),
                     },
                 ],
             },
@@ -24814,7 +25156,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1840),
+                    ty: DeclarationId(1854),
                 }],
             },
             type_params: vec![],
@@ -24834,11 +25176,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ParsedSegmentTokens".to_string(),
-                        ty: DeclarationId(1842),
+                        ty: DeclarationId(1856),
                     },
                     Field {
                         label: "MalformedPathSegment".to_string(),
-                        ty: DeclarationId(1843),
+                        ty: DeclarationId(1857),
                     },
                 ],
             },
@@ -24859,11 +25201,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ParsedPathTemplate".to_string(),
-                        ty: DeclarationId(1844),
+                        ty: DeclarationId(1858),
                     },
                     Field {
                         label: "MalformedPathTemplate".to_string(),
-                        ty: DeclarationId(1845),
+                        ty: DeclarationId(1859),
                     },
                 ],
             },
@@ -24918,7 +25260,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("last_path_param".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(730)],
-                output: DeclarationId(1824),
+                output: DeclarationId(1838),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 11761, 12044)),
             },
             type_params: vec![],
@@ -24938,15 +25280,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ReadEffect".to_string(),
-                        ty: DeclarationId(1846),
+                        ty: DeclarationId(1860),
                     },
                     Field {
                         label: "UpsertEffect".to_string(),
-                        ty: DeclarationId(1847),
+                        ty: DeclarationId(1861),
                     },
                     Field {
                         label: "DeleteEffect".to_string(),
-                        ty: DeclarationId(1848),
+                        ty: DeclarationId(1862),
                     },
                 ],
             },
@@ -24967,11 +25309,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CreateEffect".to_string(),
-                        ty: DeclarationId(1849),
+                        ty: DeclarationId(1863),
                     },
                     Field {
                         label: "AppendEffect".to_string(),
-                        ty: DeclarationId(1850),
+                        ty: DeclarationId(1864),
                     },
                 ],
             },
@@ -24992,11 +25334,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IsIdempotent".to_string(),
-                        ty: DeclarationId(1851),
+                        ty: DeclarationId(1865),
                     },
                     Field {
                         label: "IsBreaking".to_string(),
-                        ty: DeclarationId(1852),
+                        ty: DeclarationId(1866),
                     },
                 ],
             },
@@ -25017,11 +25359,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "PostAlways".to_string(),
-                        ty: DeclarationId(1853),
+                        ty: DeclarationId(1867),
                     },
                     Field {
                         label: "KeylessFallback".to_string(),
-                        ty: DeclarationId(1854),
+                        ty: DeclarationId(1868),
                     },
                 ],
             },
@@ -25042,15 +25384,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "PathParam".to_string(),
-                        ty: DeclarationId(1855),
+                        ty: DeclarationId(1869),
                     },
                     Field {
                         label: "InputField".to_string(),
-                        ty: DeclarationId(1856),
+                        ty: DeclarationId(1870),
                     },
                     Field {
                         label: "CompositeKey".to_string(),
-                        ty: DeclarationId(1858),
+                        ty: DeclarationId(1872),
                     },
                 ],
             },
@@ -25071,15 +25413,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LatticeEffect".to_string(),
-                        ty: DeclarationId(1859),
+                        ty: DeclarationId(1873),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(1860),
+                        ty: DeclarationId(1874),
                     },
                     Field {
                         label: "NonIdempotent".to_string(),
-                        ty: DeclarationId(1861),
+                        ty: DeclarationId(1875),
                     },
                 ],
             },
@@ -25161,15 +25503,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DerivedEffect".to_string(),
-                        ty: DeclarationId(1862),
+                        ty: DeclarationId(1876),
                     },
                     Field {
                         label: "UnknownHttpMethodInput".to_string(),
-                        ty: DeclarationId(1863),
+                        ty: DeclarationId(1877),
                     },
                     Field {
                         label: "MalformedPathInput".to_string(),
-                        ty: DeclarationId(1864),
+                        ty: DeclarationId(1878),
                     },
                 ],
             },
@@ -25190,11 +25532,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IdempotentComposition".to_string(),
-                        ty: DeclarationId(1865),
+                        ty: DeclarationId(1879),
                     },
                     Field {
                         label: "BrokenBy".to_string(),
-                        ty: DeclarationId(1867),
+                        ty: DeclarationId(1881),
                     },
                 ],
             },
@@ -25231,7 +25573,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(1825),
+                output: DeclarationId(1839),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20942, 20964)),
             },
             type_params: vec![],
@@ -25248,8 +25590,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(749),
             name: Some("indexed_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1826)],
-                output: DeclarationId(1828),
+                inputs: vec![DeclarationId(1840)],
+                output: DeclarationId(1842),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21058, 21151)),
             },
             type_params: vec![],
@@ -25266,8 +25608,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(750),
             name: Some("first_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1829)],
-                output: DeclarationId(1831),
+                inputs: vec![DeclarationId(1843)],
+                output: DeclarationId(1845),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21238, 21421)),
             },
             type_params: vec![],
@@ -25284,7 +25626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(751),
             name: Some("compose_effects".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1832)],
+                inputs: vec![DeclarationId(1846)],
                 output: DeclarationId(746),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22311, 22434)),
             },
@@ -25349,19 +25691,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LinearEffect".to_string(),
-                        ty: DeclarationId(1869),
+                        ty: DeclarationId(1883),
                     },
                     Field {
                         label: "BranchEffect".to_string(),
-                        ty: DeclarationId(1871),
+                        ty: DeclarationId(1885),
                     },
                     Field {
                         label: "LoopEffect".to_string(),
-                        ty: DeclarationId(1872),
+                        ty: DeclarationId(1886),
                     },
                     Field {
                         label: "ParallelEffect".to_string(),
-                        ty: DeclarationId(1874),
+                        ty: DeclarationId(1888),
                     },
                 ],
             },
@@ -25411,11 +25753,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "WorkflowCompositionVerdict".to_string(),
-                        ty: DeclarationId(1875),
+                        ty: DeclarationId(1889),
                     },
                     Field {
                         label: "IdempotencyUnsupported".to_string(),
-                        ty: DeclarationId(1876),
+                        ty: DeclarationId(1890),
                     },
                 ],
             },
@@ -25454,23 +25796,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoWorkflowProjection".to_string(),
-                        ty: DeclarationId(1877),
+                        ty: DeclarationId(1891),
                     },
                     Field {
                         label: "NotParallelEffectRoot".to_string(),
-                        ty: DeclarationId(1878),
+                        ty: DeclarationId(1892),
                     },
                     Field {
                         label: "NonLinearParallelBranch".to_string(),
-                        ty: DeclarationId(1879),
+                        ty: DeclarationId(1893),
                     },
                     Field {
                         label: "PairwiseNonCommute".to_string(),
-                        ty: DeclarationId(1880),
+                        ty: DeclarationId(1894),
                     },
                     Field {
                         label: "LensSurfacePending".to_string(),
-                        ty: DeclarationId(1881),
+                        ty: DeclarationId(1895),
                     },
                 ],
             },
@@ -25520,11 +25862,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ParallelCompositionVerdict".to_string(),
-                        ty: DeclarationId(1882),
+                        ty: DeclarationId(1896),
                     },
                     Field {
                         label: "ParallelismUnsupported".to_string(),
-                        ty: DeclarationId(1883),
+                        ty: DeclarationId(1897),
                     },
                 ],
             },
@@ -25579,7 +25921,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("parse_http_method".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
-                output: DeclarationId(1833),
+                output: DeclarationId(1847),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29705, 30003)),
             },
             type_params: vec![],
@@ -25614,7 +25956,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(765),
             name: Some("upsert_or_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1834), DeclarationId(198)],
+                inputs: vec![DeclarationId(1848), DeclarationId(198)],
                 output: DeclarationId(738),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30474, 30626)),
             },
@@ -25632,7 +25974,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(766),
             name: Some("delete_or_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1835), DeclarationId(198)],
+                inputs: vec![DeclarationId(1849), DeclarationId(198)],
                 output: DeclarationId(738),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30704, 30856)),
             },
@@ -25689,15 +26031,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Agrees".to_string(),
-                        ty: DeclarationId(1884),
+                        ty: DeclarationId(1898),
                     },
                     Field {
                         label: "Disagrees".to_string(),
-                        ty: DeclarationId(1885),
+                        ty: DeclarationId(1899),
                     },
                     Field {
                         label: "DerivationUnknown".to_string(),
-                        ty: DeclarationId(1886),
+                        ty: DeclarationId(1900),
                     },
                 ],
             },
@@ -25718,11 +26060,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ModifierNotDeclared".to_string(),
-                        ty: DeclarationId(1887),
+                        ty: DeclarationId(1901),
                     },
                     Field {
                         label: "ModifierDeclared".to_string(),
-                        ty: DeclarationId(1888),
+                        ty: DeclarationId(1902),
                     },
                 ],
             },
@@ -25860,8 +26202,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(776),
             name: Some("generate_idempotency_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1836)],
-                output: DeclarationId(1837),
+                inputs: vec![DeclarationId(1850)],
+                output: DeclarationId(1851),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 36638, 36908)),
             },
             type_params: vec![],
@@ -25954,15 +26296,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Uninferred".to_string(),
-                        ty: DeclarationId(1897),
+                        ty: DeclarationId(1911),
                     },
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(1898),
+                        ty: DeclarationId(1912),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(1899),
+                        ty: DeclarationId(1913),
                     },
                 ],
             },
@@ -25991,7 +26333,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "produced_by".to_string(),
-                        ty: DeclarationId(1900),
+                        ty: DeclarationId(1914),
                     },
                 ],
             },
@@ -26012,15 +26354,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LitInt".to_string(),
-                        ty: DeclarationId(1901),
+                        ty: DeclarationId(1915),
                     },
                     Field {
                         label: "LitBool".to_string(),
-                        ty: DeclarationId(1902),
+                        ty: DeclarationId(1916),
                     },
                     Field {
                         label: "LitString".to_string(),
-                        ty: DeclarationId(1903),
+                        ty: DeclarationId(1917),
                     },
                 ],
             },
@@ -26041,23 +26383,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1904),
+                        ty: DeclarationId(1918),
                     },
                     Field {
                         label: "UnresolvedIdentifier".to_string(),
-                        ty: DeclarationId(1905),
+                        ty: DeclarationId(1919),
                     },
                     Field {
                         label: "ResolvedByStructure".to_string(),
-                        ty: DeclarationId(1906),
+                        ty: DeclarationId(1920),
                     },
                     Field {
                         label: "ResolvedByName".to_string(),
-                        ty: DeclarationId(1907),
+                        ty: DeclarationId(1921),
                     },
                     Field {
                         label: "TypeParam".to_string(),
-                        ty: DeclarationId(1908),
+                        ty: DeclarationId(1922),
                     },
                 ],
             },
@@ -26078,15 +26420,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "OneUnit".to_string(),
-                        ty: DeclarationId(1909),
+                        ty: DeclarationId(1923),
                     },
                     Field {
                         label: "AdditionalUnit".to_string(),
-                        ty: DeclarationId(1910),
+                        ty: DeclarationId(1924),
                     },
                     Field {
                         label: "UnitCount".to_string(),
-                        ty: DeclarationId(1911),
+                        ty: DeclarationId(1925),
                     },
                 ],
             },
@@ -26107,11 +26449,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ZeroWidth".to_string(),
-                        ty: DeclarationId(1912),
+                        ty: DeclarationId(1926),
                     },
                     Field {
                         label: "PositiveWidth".to_string(),
-                        ty: DeclarationId(1913),
+                        ty: DeclarationId(1927),
                     },
                 ],
             },
@@ -26132,11 +26474,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "BoundedInterval".to_string(),
-                        ty: DeclarationId(1914),
+                        ty: DeclarationId(1928),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1915),
+                        ty: DeclarationId(1929),
                     },
                 ],
             },
@@ -26191,11 +26533,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "StaticBound".to_string(),
-                        ty: DeclarationId(1917),
+                        ty: DeclarationId(1931),
                     },
                     Field {
                         label: "PlatformDependent".to_string(),
-                        ty: DeclarationId(1918),
+                        ty: DeclarationId(1932),
                     },
                 ],
             },
@@ -26216,15 +26558,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Exact".to_string(),
-                        ty: DeclarationId(1919),
+                        ty: DeclarationId(1933),
                     },
                     Field {
                         label: "AtMostOne".to_string(),
-                        ty: DeclarationId(1920),
+                        ty: DeclarationId(1934),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1921),
+                        ty: DeclarationId(1935),
                     },
                 ],
             },
@@ -26320,27 +26662,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1922),
+                        ty: DeclarationId(1936),
                     },
                     Field {
                         label: "Reference".to_string(),
-                        ty: DeclarationId(1923),
+                        ty: DeclarationId(1937),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(1925),
+                        ty: DeclarationId(1939),
                     },
                     Field {
                         label: "List".to_string(),
-                        ty: DeclarationId(1927),
+                        ty: DeclarationId(1941),
                     },
                     Field {
                         label: "Map".to_string(),
-                        ty: DeclarationId(1929),
+                        ty: DeclarationId(1943),
                     },
                     Field {
                         label: "Variant".to_string(),
-                        ty: DeclarationId(1931),
+                        ty: DeclarationId(1945),
                     },
                 ],
             },
@@ -26361,23 +26703,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ValueBodyUnparsed".to_string(),
-                        ty: DeclarationId(1932),
+                        ty: DeclarationId(1946),
                     },
                     Field {
                         label: "ValueBodyStructural".to_string(),
-                        ty: DeclarationId(1934),
+                        ty: DeclarationId(1948),
                     },
                     Field {
                         label: "ValueBodyScalar".to_string(),
-                        ty: DeclarationId(1935),
+                        ty: DeclarationId(1949),
                     },
                     Field {
                         label: "ValueBodyList".to_string(),
-                        ty: DeclarationId(1937),
+                        ty: DeclarationId(1951),
                     },
                     Field {
                         label: "ValueBodyMap".to_string(),
-                        ty: DeclarationId(1939),
+                        ty: DeclarationId(1953),
                     },
                 ],
             },
@@ -26417,23 +26759,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UserDefined".to_string(),
-                        ty: DeclarationId(1940),
+                        ty: DeclarationId(1954),
                     },
                     Field {
                         label: "ExternalRealization".to_string(),
-                        ty: DeclarationId(1941),
+                        ty: DeclarationId(1955),
                     },
                     Field {
                         label: "Pending".to_string(),
-                        ty: DeclarationId(1942),
+                        ty: DeclarationId(1956),
                     },
                     Field {
                         label: "NoBody".to_string(),
-                        ty: DeclarationId(1943),
+                        ty: DeclarationId(1957),
                     },
                     Field {
                         label: "Unparsed".to_string(),
-                        ty: DeclarationId(1944),
+                        ty: DeclarationId(1958),
                     },
                 ],
             },
@@ -26454,27 +26796,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Atom".to_string(),
-                        ty: DeclarationId(1945),
+                        ty: DeclarationId(1959),
                     },
                     Field {
                         label: "Conj".to_string(),
-                        ty: DeclarationId(1947),
+                        ty: DeclarationId(1961),
                     },
                     Field {
                         label: "Disj".to_string(),
-                        ty: DeclarationId(1949),
+                        ty: DeclarationId(1963),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(1951),
+                        ty: DeclarationId(1965),
                     },
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1952),
+                        ty: DeclarationId(1966),
                     },
                     Field {
                         label: "Instantiation".to_string(),
-                        ty: DeclarationId(1954),
+                        ty: DeclarationId(1968),
                     },
                 ],
             },
@@ -26499,7 +26841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(1955),
+                        ty: DeclarationId(1969),
                     },
                     Field {
                         label: "connective".to_string(),
@@ -26507,27 +26849,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(1956),
+                        ty: DeclarationId(1970),
                     },
                     Field {
                         label: "phantom_params".to_string(),
-                        ty: DeclarationId(1957),
+                        ty: DeclarationId(1971),
                     },
                     Field {
                         label: "meta_tag".to_string(),
-                        ty: DeclarationId(1958),
+                        ty: DeclarationId(1972),
                     },
                     Field {
                         label: "inhabits".to_string(),
-                        ty: DeclarationId(1959),
+                        ty: DeclarationId(1973),
                     },
                     Field {
                         label: "value_body".to_string(),
-                        ty: DeclarationId(1960),
+                        ty: DeclarationId(1974),
                     },
                     Field {
                         label: "nominal_opacity".to_string(),
-                        ty: DeclarationId(1961),
+                        ty: DeclarationId(1975),
                     },
                     Field {
                         label: "span".to_string(),
@@ -26576,7 +26918,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "permitted_accessors".to_string(),
-                    ty: DeclarationId(1962),
+                    ty: DeclarationId(1976),
                 }],
             },
             type_params: vec![],
@@ -26596,19 +26938,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Add".to_string(),
-                        ty: DeclarationId(1963),
+                        ty: DeclarationId(1977),
                     },
                     Field {
                         label: "Sub".to_string(),
-                        ty: DeclarationId(1964),
+                        ty: DeclarationId(1978),
                     },
                     Field {
                         label: "Mul".to_string(),
-                        ty: DeclarationId(1965),
+                        ty: DeclarationId(1979),
                     },
                     Field {
                         label: "Div".to_string(),
-                        ty: DeclarationId(1966),
+                        ty: DeclarationId(1980),
                     },
                 ],
             },
@@ -26629,27 +26971,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(1967),
+                        ty: DeclarationId(1981),
                     },
                     Field {
                         label: "Ne".to_string(),
-                        ty: DeclarationId(1968),
+                        ty: DeclarationId(1982),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(1969),
+                        ty: DeclarationId(1983),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(1970),
+                        ty: DeclarationId(1984),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(1971),
+                        ty: DeclarationId(1985),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(1972),
+                        ty: DeclarationId(1986),
                     },
                 ],
             },
@@ -26695,11 +27037,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "And".to_string(),
-                        ty: DeclarationId(1973),
+                        ty: DeclarationId(1987),
                     },
                     Field {
                         label: "Or".to_string(),
-                        ty: DeclarationId(1974),
+                        ty: DeclarationId(1988),
                     },
                 ],
             },
@@ -26720,15 +27062,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Arithmetic".to_string(),
-                        ty: DeclarationId(1975),
+                        ty: DeclarationId(1989),
                     },
                     Field {
                         label: "Comparison".to_string(),
-                        ty: DeclarationId(1976),
+                        ty: DeclarationId(1990),
                     },
                     Field {
                         label: "Logical".to_string(),
-                        ty: DeclarationId(1977),
+                        ty: DeclarationId(1991),
                     },
                 ],
             },
@@ -26749,19 +27091,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Callable".to_string(),
-                        ty: DeclarationId(1978),
+                        ty: DeclarationId(1992),
                     },
                     Field {
                         label: "UnresolvedFieldProject".to_string(),
-                        ty: DeclarationId(1979),
+                        ty: DeclarationId(1993),
                     },
                     Field {
                         label: "ResolvedFieldProject".to_string(),
-                        ty: DeclarationId(1980),
+                        ty: DeclarationId(1994),
                     },
                     Field {
                         label: "Operator".to_string(),
-                        ty: DeclarationId(1981),
+                        ty: DeclarationId(1995),
                     },
                 ],
             },
@@ -26782,11 +27124,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UnresolvedVariant".to_string(),
-                        ty: DeclarationId(1982),
+                        ty: DeclarationId(1996),
                     },
                     Field {
                         label: "ResolvedVariant".to_string(),
-                        ty: DeclarationId(1983),
+                        ty: DeclarationId(1997),
                     },
                 ],
             },
@@ -26844,7 +27186,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "binding".to_string(),
-                        ty: DeclarationId(1984),
+                        ty: DeclarationId(1998),
                     },
                 ],
             },
@@ -26980,11 +27322,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "members".to_string(),
-                        ty: DeclarationId(1985),
+                        ty: DeclarationId(1999),
                     },
                     Field {
                         label: "intra_cluster_calls".to_string(),
-                        ty: DeclarationId(1986),
+                        ty: DeclarationId(2000),
                     },
                 ],
             },
@@ -27005,11 +27347,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1987),
+                        ty: DeclarationId(2001),
                     },
                     Field {
                         label: "Descent".to_string(),
-                        ty: DeclarationId(1988),
+                        ty: DeclarationId(2002),
                     },
                 ],
             },
@@ -27064,7 +27406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1989),
+                        ty: DeclarationId(2003),
                     },
                 ],
             },
@@ -27093,7 +27435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1990),
+                        ty: DeclarationId(2004),
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -27121,7 +27463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserMatch".to_string(),
-                    ty: DeclarationId(1991),
+                    ty: DeclarationId(2005),
                 }],
             },
             type_params: vec![],
@@ -27149,7 +27491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "paths".to_string(),
-                        ty: DeclarationId(1992),
+                        ty: DeclarationId(2006),
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -27161,7 +27503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1993),
+                        ty: DeclarationId(2007),
                     },
                 ],
             },
@@ -27226,7 +27568,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserCallable".to_string(),
-                    ty: DeclarationId(1994),
+                    ty: DeclarationId(2008),
                 }],
             },
             type_params: vec![],
@@ -27258,7 +27600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(1995),
+                        ty: DeclarationId(2009),
                     },
                     Field {
                         label: "span".to_string(),
@@ -27266,11 +27608,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1996),
+                        ty: DeclarationId(2010),
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1997),
+                        ty: DeclarationId(2011),
                     },
                 ],
             },
@@ -27291,23 +27633,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Value".to_string(),
-                        ty: DeclarationId(1998),
+                        ty: DeclarationId(2012),
                     },
                     Field {
                         label: "Transform".to_string(),
-                        ty: DeclarationId(1999),
+                        ty: DeclarationId(2013),
                     },
                     Field {
                         label: "Branch".to_string(),
-                        ty: DeclarationId(2000),
+                        ty: DeclarationId(2014),
                     },
                     Field {
                         label: "Loop".to_string(),
-                        ty: DeclarationId(2001),
+                        ty: DeclarationId(2015),
                     },
                     Field {
                         label: "Bind".to_string(),
-                        ty: DeclarationId(2002),
+                        ty: DeclarationId(2016),
                     },
                 ],
             },
@@ -27328,19 +27670,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "declarations".to_string(),
-                        ty: DeclarationId(2003),
+                        ty: DeclarationId(2017),
                     },
                     Field {
                         label: "nodes".to_string(),
-                        ty: DeclarationId(2004),
+                        ty: DeclarationId(2018),
                     },
                     Field {
                         label: "ports".to_string(),
-                        ty: DeclarationId(2005),
+                        ty: DeclarationId(2019),
                     },
                     Field {
                         label: "clusters".to_string(),
-                        ty: DeclarationId(2006),
+                        ty: DeclarationId(2020),
                     },
                 ],
             },
@@ -27380,15 +27722,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "accessor".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                     Field {
                         label: "realization".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                 ],
             },
@@ -27407,7 +27749,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("port".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(722)],
-                output: DeclarationId(1889),
+                output: DeclarationId(1903),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22297,
@@ -27429,7 +27771,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("node".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(1890),
+                output: DeclarationId(1904),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22355,
@@ -27451,7 +27793,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(1891),
+                output: DeclarationId(1905),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22430,
@@ -27473,7 +27815,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(1892),
+                output: DeclarationId(1906),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22819,
@@ -27495,7 +27837,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(1893),
+                output: DeclarationId(1907),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     23694,
@@ -27517,7 +27859,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(1894),
+                output: DeclarationId(1908),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     24020,
@@ -27541,15 +27883,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "SingleRoot".to_string(),
-                        ty: DeclarationId(2007),
+                        ty: DeclarationId(2021),
                     },
                     Field {
                         label: "NoRoot".to_string(),
-                        ty: DeclarationId(2008),
+                        ty: DeclarationId(2022),
                     },
                     Field {
                         label: "AmbiguousRoot".to_string(),
-                        ty: DeclarationId(2010),
+                        ty: DeclarationId(2024),
                     },
                 ],
             },
@@ -27590,7 +27932,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("miss_declaration_id_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1895),
+                output: DeclarationId(1909),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     28025,
@@ -27612,7 +27954,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(1896),
+                output: DeclarationId(1910),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     28110,
@@ -27635,7 +27977,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "decl".to_string(),
-                    ty: DeclarationId(1316),
+                    ty: DeclarationId(1330),
                 }],
             },
             type_params: vec![],
@@ -27650,20 +27992,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(842),
-            name: Some("CollectionSizeEffect".to_string()),
+            name: Some("AnthropicChatMessage".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "ShrinkEffect".to_string(),
-                        ty: DeclarationId(2035),
-                    },
-                    Field {
-                        label: "ProjectionEffect".to_string(),
-                        ty: DeclarationId(2036),
+                        label: "UserMessage".to_string(),
+                        ty: DeclarationId(2026),
                     },
                     Field {
-                        label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(2037),
+                        label: "AssistantMessage".to_string(),
+                        ty: DeclarationId(2028),
                     },
                 ],
             },
@@ -27675,28 +28013,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 4923, 5005),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2660, 2822),
         });
         declarations.push(Declaration {
             id: DeclarationId(843),
-            name: Some("CostShape".to_string()),
+            name: Some("ImageSource".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "ShapeConstant".to_string(),
-                        ty: DeclarationId(2038),
-                    },
-                    Field {
-                        label: "ShapeLinearScan".to_string(),
-                        ty: DeclarationId(2039),
-                    },
-                    Field {
-                        label: "ShapeIterateBody".to_string(),
-                        ty: DeclarationId(2040),
+                        label: "Base64Image".to_string(),
+                        ty: DeclarationId(2029),
                     },
                     Field {
-                        label: "ShapeSortBody".to_string(),
-                        ty: DeclarationId(2041),
+                        label: "UrlImage".to_string(),
+                        ty: DeclarationId(2030),
                     },
                 ],
             },
@@ -27708,32 +28038,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 5836, 5927),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3190, 3305),
         });
         declarations.push(Declaration {
             id: DeclarationId(844),
-            name: Some("MethodContract".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "algebra_id".to_string(),
-                        ty: DeclarationId(723),
-                    },
-                    Field {
-                        label: "method_id".to_string(),
-                        ty: DeclarationId(723),
-                    },
-                    Field {
-                        label: "size_effect".to_string(),
-                        ty: DeclarationId(2042),
-                    },
+            name: Some("ContentBlock".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "cost_shape".to_string(),
-                        ty: DeclarationId(2043),
+                        label: "TextContent".to_string(),
+                        ty: DeclarationId(2031),
                     },
                     Field {
-                        label: "callback_element_position".to_string(),
-                        ty: DeclarationId(2044),
+                        label: "ImageContent".to_string(),
+                        ty: DeclarationId(2032),
                     },
                 ],
             },
@@ -27745,22 +28063,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 6688, 6862),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3546, 3637),
         });
         declarations.push(Declaration {
             id: DeclarationId(845),
-            name: Some("SizeVariable".to_string()),
+            name: Some("CacheControl".to_string()),
             connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "source_port".to_string(),
-                        ty: DeclarationId(722),
-                    },
-                    Field {
-                        label: "display_name".to_string(),
-                        ty: DeclarationId(2045),
-                    },
-                ],
+                children: vec![Field {
+                    label: "type".to_string(),
+                    ty: DeclarationId(230),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -27770,15 +28082,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 7371, 7438),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3804, 3840),
         });
         declarations.push(Declaration {
             id: DeclarationId(846),
-            name: Some("unnamed_size_variable".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(722)],
-                output: DeclarationId(845),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 7502, 7534)),
+            name: Some("AnthropicSearchResultCitationsConfig".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "enabled".to_string(),
+                    ty: DeclarationId(128),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -27788,15 +28101,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 7440, 7534),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3937, 3998),
         });
         declarations.push(Declaration {
             id: DeclarationId(847),
-            name: Some("size_variable_eq".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(845), DeclarationId(845)],
-                output: DeclarationId(128),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(178))),
+            name: Some("AnthropicToolResultContent".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "ToolResultText".to_string(),
+                        ty: DeclarationId(2033),
+                    },
+                    Field {
+                        label: "ToolResultBlocks".to_string(),
+                        ty: DeclarationId(2035),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -27806,22 +28126,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 7536, 7632),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4296, 4407),
         });
         declarations.push(Declaration {
             id: DeclarationId(848),
-            name: Some("DegreeAtLeastTwo".to_string()),
+            name: Some("AnthropicToolResultWireTextTag".to_string()),
             connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "DegreeTwo".to_string(),
-                        ty: DeclarationId(2046),
-                    },
-                    Field {
-                        label: "DegreeSuccessor".to_string(),
-                        ty: DeclarationId(2047),
-                    },
-                ],
+                variants: vec![Field {
+                    label: "Text".to_string(),
+                    ty: DeclarationId(2036),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -27831,65 +28145,39 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 8379, 8465),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5576, 5623),
         });
         declarations.push(Declaration {
             id: DeclarationId(849),
-            name: Some("SymbolicCost".to_string()),
+            name: Some("AnthropicPlainTextDocumentMediaType".to_string()),
             connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "ConstantCost".to_string(),
-                        ty: DeclarationId(2048),
-                    },
-                    Field {
-                        label: "LinearCost".to_string(),
-                        ty: DeclarationId(2049),
-                    },
-                    Field {
-                        label: "PolynomialCost".to_string(),
-                        ty: DeclarationId(2050),
-                    },
-                    Field {
-                        label: "ProductCost".to_string(),
-                        ty: DeclarationId(2052),
-                    },
-                    Field {
-                        label: "SumCost".to_string(),
-                        ty: DeclarationId(2054),
-                    },
-                    Field {
-                        label: "LogCost".to_string(),
-                        ty: DeclarationId(2055),
-                    },
-                    Field {
-                        label: "UnknownCost".to_string(),
-                        ty: DeclarationId(2056),
-                    },
-                ],
+                variants: vec![Field {
+                    label: "TextPlain".to_string(),
+                    ty: DeclarationId(2037),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: Some(DeclarationId(2057)),
+            inhabits: None,
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 9452, 9761),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5704, 5761),
         });
         declarations.push(Declaration {
             id: DeclarationId(850),
-            name: Some("DominateScanAcc".to_string()),
+            name: Some("AnthropicToolResultTextBlock".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "any".to_string(),
-                        ty: DeclarationId(128),
+                        label: "type".to_string(),
+                        ty: DeclarationId(848),
                     },
                     Field {
-                        label: "pivot".to_string(),
-                        ty: DeclarationId(849),
+                        label: "text".to_string(),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -27901,15 +28189,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 10167, 10225),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5852, 5943),
         });
         declarations.push(Declaration {
             id: DeclarationId(851),
-            name: Some("dominate_scan_init".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849)],
-                output: DeclarationId(850),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(181))),
+            name: Some("AnthropicToolResultBlock".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "AnthropicTextBlock".to_string(),
+                        ty: DeclarationId(2038),
+                    },
+                    Field {
+                        label: "AnthropicImageBlock".to_string(),
+                        ty: DeclarationId(2039),
+                    },
+                    Field {
+                        label: "AnthropicDocumentBlock".to_string(),
+                        ty: DeclarationId(2040),
+                    },
+                    Field {
+                        label: "AnthropicSearchResultBlock".to_string(),
+                        ty: DeclarationId(2044),
+                    },
+                    Field {
+                        label: "AnthropicToolReferenceBlock".to_string(),
+                        ty: DeclarationId(2045),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -27919,15 +28226,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 10227, 10322),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5945, 6418),
         });
         declarations.push(Declaration {
             id: DeclarationId(852),
-            name: Some("miss_symbolic_cost_lookup".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(2011),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 10963, 10973)),
+            name: Some("AnthropicToolResultPlainTextDocumentSource".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "type".to_string(),
+                        ty: DeclarationId(848),
+                    },
+                    Field {
+                        label: "media_type".to_string(),
+                        ty: DeclarationId(849),
+                    },
+                    Field {
+                        label: "document_data".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -27937,15 +28255,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 10908, 10973),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6420, 6645),
         });
         declarations.push(Declaration {
             id: DeclarationId(853),
-            name: Some("hit_symbolic_cost_lookup".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849)],
-                output: DeclarationId(2012),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 11047, 11062)),
+            name: Some("AnthropicUserContentBlock".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "UserTextBlock".to_string(),
+                        ty: DeclarationId(2046),
+                    },
+                    Field {
+                        label: "UserToolResultBlock".to_string(),
+                        ty: DeclarationId(2049),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -27955,15 +28280,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 10975, 11062),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6891, 7085),
         });
         declarations.push(Declaration {
             id: DeclarationId(854),
-            name: Some("two_terms".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849), DeclarationId(849)],
-                output: DeclarationId(2013),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(185))),
+            name: Some("AnthropicAssistantContentBlock".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "AssistantTextBlock".to_string(),
+                        ty: DeclarationId(2050),
+                    },
+                    Field {
+                        label: "AssistantToolUseBlock".to_string(),
+                        ty: DeclarationId(2051),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -27973,141 +28305,42 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 11064, 11539),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7492, 7658),
         });
         declarations.push(Declaration {
             id: DeclarationId(855),
-            name: Some("many_terms".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849), DeclarationId(849), DeclarationId(2014)],
-                output: DeclarationId(2015),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(187))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 11541, 11726),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(856),
-            name: Some("reject_all_symbolic_costs".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849)],
-                output: DeclarationId(128),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(192))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 11728, 11856),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(857),
-            name: Some("degree_raw".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(848)],
-                output: DeclarationId(93),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(200))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 11858, 12011),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(858),
-            name: Some("sequential".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849), DeclarationId(849)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(204))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 12247, 12350),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(859),
-            name: Some("iterate".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849), DeclarationId(849)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(208))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 12536, 12654),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(860),
-            name: Some("max_path_step".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849), DeclarationId(849)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(212))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 13514, 13681),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(861),
-            name: Some("keep_or_sum".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849), DeclarationId(849)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(216))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 13683, 13841),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(862),
-            name: Some("max_path".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2016)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(220))),
+            name: Some("AnthropicStopReason".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "EndTurn".to_string(),
+                        ty: DeclarationId(2052),
+                    },
+                    Field {
+                        label: "MaxTokens".to_string(),
+                        ty: DeclarationId(2053),
+                    },
+                    Field {
+                        label: "StopSequence".to_string(),
+                        ty: DeclarationId(2054),
+                    },
+                    Field {
+                        label: "ToolUse".to_string(),
+                        ty: DeclarationId(2055),
+                    },
+                    Field {
+                        label: "PauseTurn".to_string(),
+                        ty: DeclarationId(2056),
+                    },
+                    Field {
+                        label: "Refusal".to_string(),
+                        ty: DeclarationId(2057),
+                    },
+                    Field {
+                        label: "ModelContextWindowExceeded".to_string(),
+                        ty: DeclarationId(2058),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28117,15 +28350,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 14143, 14245),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7987, 8123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(863),
-            name: Some("dominates".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849), DeclarationId(849)],
-                output: DeclarationId(128),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(273))),
+            id: DeclarationId(856),
+            name: Some("AnthropicMessages200Citation".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "CharLocation".to_string(),
+                        ty: DeclarationId(2061),
+                    },
+                    Field {
+                        label: "PageLocation".to_string(),
+                        ty: DeclarationId(2064),
+                    },
+                    Field {
+                        label: "ContentBlockLocation".to_string(),
+                        ty: DeclarationId(2067),
+                    },
+                    Field {
+                        label: "WebSearchResultLocation".to_string(),
+                        ty: DeclarationId(2069),
+                    },
+                    Field {
+                        label: "SearchResultLocation".to_string(),
+                        ty: DeclarationId(2071),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28135,15 +28387,38 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 15113, 17198),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8325, 9071),
         });
         declarations.push(Declaration {
-            id: DeclarationId(864),
-            name: Some("same_size_variable".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(845), DeclarationId(845)],
-                output: DeclarationId(128),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(275))),
+            id: DeclarationId(857),
+            name: Some("AnthropicMessages200ContentBlock".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "MessagesTextBlock".to_string(),
+                        ty: DeclarationId(2074),
+                    },
+                    Field {
+                        label: "MessagesThinkingBlock".to_string(),
+                        ty: DeclarationId(2075),
+                    },
+                    Field {
+                        label: "MessagesRedactedThinkingBlock".to_string(),
+                        ty: DeclarationId(2076),
+                    },
+                    Field {
+                        label: "MessagesToolUseBlock".to_string(),
+                        ty: DeclarationId(2078),
+                    },
+                    Field {
+                        label: "MessagesServerToolUseBlock".to_string(),
+                        ty: DeclarationId(2080),
+                    },
+                    Field {
+                        label: "MessagesWebSearchToolResultBlock".to_string(),
+                        ty: DeclarationId(2082),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28153,44 +28428,44 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 17200, 17290),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9608, 10136),
         });
         declarations.push(Declaration {
-            id: DeclarationId(865),
-            name: Some("AsymptoticClass".to_string()),
+            id: DeclarationId(858),
+            name: Some("AnthropicServerToolName".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "ClassConstant".to_string(),
-                        ty: DeclarationId(2058),
+                        label: "WebSearch".to_string(),
+                        ty: DeclarationId(2083),
                     },
                     Field {
-                        label: "ClassLog".to_string(),
-                        ty: DeclarationId(2059),
+                        label: "WebFetch".to_string(),
+                        ty: DeclarationId(2084),
                     },
                     Field {
-                        label: "ClassLinear".to_string(),
-                        ty: DeclarationId(2060),
+                        label: "CodeExecution".to_string(),
+                        ty: DeclarationId(2085),
                     },
                     Field {
-                        label: "ClassLinearithmic".to_string(),
-                        ty: DeclarationId(2061),
+                        label: "BashCodeExecution".to_string(),
+                        ty: DeclarationId(2086),
                     },
                     Field {
-                        label: "ClassQuadratic".to_string(),
-                        ty: DeclarationId(2062),
+                        label: "TextEditorCodeExecution".to_string(),
+                        ty: DeclarationId(2087),
                     },
                     Field {
-                        label: "ClassPolynomial".to_string(),
-                        ty: DeclarationId(2063),
+                        label: "ToolSearchToolRegex".to_string(),
+                        ty: DeclarationId(2088),
                     },
                     Field {
-                        label: "ClassExponential".to_string(),
-                        ty: DeclarationId(2064),
+                        label: "ToolSearchToolBm25".to_string(),
+                        ty: DeclarationId(2089),
                     },
                     Field {
-                        label: "ClassUnknown".to_string(),
-                        ty: DeclarationId(2065),
+                        label: "Advisor".to_string(),
+                        ty: DeclarationId(2090),
                     },
                 ],
             },
@@ -28198,127 +28473,38 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: Some(DeclarationId(2066)),
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 18077, 18318),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(866),
-            name: Some("asymptotic_dominates".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(865), DeclarationId(865)],
-                output: DeclarationId(128),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(345))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 18320, 20588),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(867),
-            name: Some("meet_asymptotic_class".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(865), DeclarationId(865)],
-                output: DeclarationId(865),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(348))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 20590, 20721),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(868),
-            name: Some("join_asymptotic_class".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(865), DeclarationId(865)],
-                output: DeclarationId(865),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(351))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 20723, 20854),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(869),
-            name: Some("classify_symbolic_cost".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849)],
-                output: DeclarationId(865),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 20921, 20954)),
-            },
-            type_params: vec![],
-            phantom_params: 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", 20856, 20954),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(870),
-            name: Some("normalize".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(360))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 21828, 22193),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(871),
-            name: Some("nsl_to_list".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2017)],
-                output: DeclarationId(2018),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(366))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 22195, 22324),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10324, 10506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(872),
-            name: Some("drop_additive_zero".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2019)],
-                output: DeclarationId(2020),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(379))),
+            id: DeclarationId(859),
+            name: Some("AnthropicMessages200Usage".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "input_tokens".to_string(),
+                        ty: DeclarationId(93),
+                    },
+                    Field {
+                        label: "output_tokens".to_string(),
+                        ty: DeclarationId(93),
+                    },
+                    Field {
+                        label: "cache_creation_input_tokens".to_string(),
+                        ty: DeclarationId(2091),
+                    },
+                    Field {
+                        label: "cache_read_input_tokens".to_string(),
+                        ty: DeclarationId(2092),
+                    },
+                    Field {
+                        label: "service_tier".to_string(),
+                        ty: DeclarationId(2093),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28328,15 +28514,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 22501, 22793),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10622, 10837),
         });
         declarations.push(Declaration {
-            id: DeclarationId(873),
-            name: Some("collapse_on_multiplicative_zero".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2021)],
-                output: DeclarationId(2022),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(386))),
+            id: DeclarationId(860),
+            name: Some("AnthropicMessages200Role".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![Field {
+                    label: "Assistant".to_string(),
+                    ty: DeclarationId(2094),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28346,15 +28533,50 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 23002, 23165),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11158, 11201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(874),
-            name: Some("any_zero".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2023)],
-                output: DeclarationId(128),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(395))),
+            id: DeclarationId(861),
+            name: Some("AnthropicMessages200Body".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "id".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "type".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "role".to_string(),
+                        ty: DeclarationId(860),
+                    },
+                    Field {
+                        label: "content".to_string(),
+                        ty: DeclarationId(2095),
+                    },
+                    Field {
+                        label: "model".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "stop_reason".to_string(),
+                        ty: DeclarationId(855),
+                    },
+                    Field {
+                        label: "stop_sequence".to_string(),
+                        ty: DeclarationId(2096),
+                    },
+                    Field {
+                        label: "usage".to_string(),
+                        ty: DeclarationId(859),
+                    },
+                    Field {
+                        label: "container".to_string(),
+                        ty: DeclarationId(2097),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28364,15 +28586,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 23167, 23332),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11548, 11879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(875),
-            name: Some("drop_multiplicative_one".to_string()),
+            id: DeclarationId(862),
+            name: Some("anthropic_messages".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2024)],
-                output: DeclarationId(2025),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(408))),
+                inputs: vec![
+                    DeclarationId(147),
+                    DeclarationId(230),
+                    DeclarationId(2098),
+                    DeclarationId(93),
+                    DeclarationId(2099),
+                    DeclarationId(2100),
+                ],
+                output: DeclarationId(861),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/anthropic_messages.dag",
+                    4627,
+                    4656,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28382,15 +28615,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 23490, 23796),
+            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4419, 4656),
         });
         declarations.push(Declaration {
-            id: DeclarationId(876),
-            name: Some("is_zero_constant".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849)],
-                output: DeclarationId(128),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(418))),
+            id: DeclarationId(863),
+            name: Some("BinShim".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "entrypoint_name".to_string(),
+                        ty: DeclarationId(151),
+                    },
+                    Field {
+                        label: "description".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "entry".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28400,15 +28644,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 23798, 24052),
+            span: SourceSpan::new("src/v3/std/bin_shim.dag", 801, 894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(877),
-            name: Some("is_one_constant".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849)],
-                output: DeclarationId(128),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(428))),
+            id: DeclarationId(864),
+            name: Some("BootstrapAuthority".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "StdAuthority".to_string(),
+                        ty: DeclarationId(2101),
+                    },
+                    Field {
+                        label: "V3StdAuthority".to_string(),
+                        ty: DeclarationId(2102),
+                    },
+                    Field {
+                        label: "V3SpecAuthority".to_string(),
+                        ty: DeclarationId(2103),
+                    },
+                    Field {
+                        label: "CompilerAuthority".to_string(),
+                        ty: DeclarationId(2104),
+                    },
+                    Field {
+                        label: "ExtdepsFixtureAuthority".to_string(),
+                        ty: DeclarationId(2105),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28418,15 +28681,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 24054, 24307),
+            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 985, 1114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(878),
-            name: Some("reduce_sum".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2026)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(440))),
+            id: DeclarationId(865),
+            name: Some("BootstrapAuthoritySet".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(137),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(864),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28436,51 +28707,526 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 25092, 25363),
+            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1299, 1359),
         });
         declarations.push(Declaration {
-            id: DeclarationId(879),
-            name: Some("wrap_sum".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2027)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(452))),
+            id: DeclarationId(866),
+            name: Some("bootstrap_authority".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(865),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(865)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 25365, 25640),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(880),
-            name: Some("reduce_product".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2028)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(469))),
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Map(
+                FieldMap::from_entries(vec![
+                    (
+                        "dsl/std/logic.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2101),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/bit.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2101),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/error_primitives.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2101),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/algebra.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2101),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/magnitude.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2101),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/machine_constraints.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2101),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/nat.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2101),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/integer.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2101),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/rational.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2101),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/float.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2101),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/types.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2101),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/string_type.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2101),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/unicode.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2101),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/render_repeat_string_bootstrap.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2101),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/methods.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2101),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/serialization.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2101),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/algebra.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/anthropic_messages.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/anthropic_operations.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/anthropic_schema.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/approximate_field.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/bin_shim.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/bootstrap_authority.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/bridge_ledger.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/clean_emission.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/computation.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/computation_model.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/coproduct_projection.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/cross_target_coverage.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/diagnostics.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/dimensions.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/effects.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/emission_provenance.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/emit_model.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/extdeps_bootstrap_fixtures.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/go_method_template_contracts.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/induction.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/integer_diagnostic_order.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/lens.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/lens_application.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/list.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/lookup.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/methods.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/parse_surface.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/python_method_template_contracts.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/resources.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/runtime.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/rust_method_template_contracts.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/services.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/substrate.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/substrate_minimal.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/termination.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/timing_lens.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/t_ci_workflow_as_data_demo.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/tokenize.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/verification.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/workflows.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2102),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/spec/v3_l1.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2103),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/spec/go.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2103),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/spec/python.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2103),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/spec/rust.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2103),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/compiler/pipeline.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2104),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/compiler/operators.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2104),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/compiler/regen.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2104),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/extdeps/languages/rust/primitives.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2105),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/extdeps/cron_schedule_model.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2105),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/extdeps/github/github.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2105),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/extdeps/github/actions.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2105),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/extdeps/github/ci.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2105),
+                            payload: vec![],
+                        },
+                    ),
+                ])
+                .expect("ValueBody::Map"),
+            )),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 25825, 26246),
+            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1361, 4934),
         });
         declarations.push(Declaration {
-            id: DeclarationId(881),
-            name: Some("combine_binary_product".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849), DeclarationId(849)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(478))),
+            id: DeclarationId(867),
+            name: Some("BridgeStatus".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "Retired".to_string(),
+                        ty: DeclarationId(2106),
+                    },
+                    Field {
+                        label: "Open".to_string(),
+                        ty: DeclarationId(2107),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28490,15 +29236,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 26411, 26798),
+            span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4697, 4735),
         });
         declarations.push(Declaration {
-            id: DeclarationId(882),
-            name: Some("combine_linear_with".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(845), DeclarationId(849), DeclarationId(849)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(487))),
+            id: DeclarationId(868),
+            name: Some("BridgeLedgerRef".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "decl".to_string(),
+                    ty: DeclarationId(1330),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28508,20 +29255,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 26800, 27209),
+            span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 5699, 5746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(883),
-            name: Some("collapse_linear_square".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![
-                    DeclarationId(845),
-                    DeclarationId(845),
-                    DeclarationId(849),
-                    DeclarationId(849),
+            id: DeclarationId(869),
+            name: Some("BridgeLedgerRow".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "name".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "owner".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "status".to_string(),
+                        ty: DeclarationId(867),
+                    },
+                    Field {
+                        label: "authority".to_string(),
+                        ty: DeclarationId(230),
+                    },
                 ],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(492))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28531,15 +29288,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 27211, 27427),
+            span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6389, 6499),
         });
+        declarations.push(Declaration { id: DeclarationId(870), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(869) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2108)), 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(2107), 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(2106), 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(2106), 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(2106), 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(2106), 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(2106), 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(2107), 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(884),
-            name: Some("polynomial_square".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(845)],
-                output: DeclarationId(849),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 27483, 27533)),
+            id: DeclarationId(871),
+            name: Some("Mutability".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "Immutable".to_string(),
+                        ty: DeclarationId(2109),
+                    },
+                    Field {
+                        label: "Mutable".to_string(),
+                        ty: DeclarationId(2110),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28549,69 +29314,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 27429, 27533),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 340, 381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(885),
-            name: Some("product_pair".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849), DeclarationId(849)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(495))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 27535, 27633),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(886),
-            name: Some("fold_or_dominate_scan".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(850), DeclarationId(849)],
-                output: DeclarationId(850),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(502))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 27635, 27784),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(887),
-            name: Some("scan_hit".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(850)],
-                output: DeclarationId(128),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(504))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 27786, 27841),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(888),
-            name: Some("filter_not_dominated_by".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2029), DeclarationId(849)],
-                output: DeclarationId(2030),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(517))),
+            id: DeclarationId(872),
+            name: Some("Purity".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "Pure".to_string(),
+                        ty: DeclarationId(2111),
+                    },
+                    Field {
+                        label: "Effectful".to_string(),
+                        ty: DeclarationId(2112),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28621,15 +29339,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 27843, 28205),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 598, 632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(889),
-            name: Some("drop_dominated_step".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2031), DeclarationId(849)],
-                output: DeclarationId(2032),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(524))),
+            id: DeclarationId(873),
+            name: Some("Structure".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "ExplicitDAG".to_string(),
+                        ty: DeclarationId(2113),
+                    },
+                    Field {
+                        label: "Arbitrary".to_string(),
+                        ty: DeclarationId(2114),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28639,15 +29364,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 28207, 28449),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 891, 935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(890),
-            name: Some("drop_dominated".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2033)],
-                output: DeclarationId(2034),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(527))),
+            id: DeclarationId(874),
+            name: Some("Iteration".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "Bounded".to_string(),
+                        ty: DeclarationId(2115),
+                    },
+                    Field {
+                        label: "Unbounded".to_string(),
+                        ty: DeclarationId(2116),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28657,26 +29389,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 28637, 28749),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 1147, 1187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(891),
-            name: Some("anthropic_messages".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![
-                    DeclarationId(147),
-                    DeclarationId(230),
-                    DeclarationId(2094),
-                    DeclarationId(93),
-                    DeclarationId(2095),
-                    DeclarationId(2096),
+            id: DeclarationId(875),
+            name: Some("ComputationModel".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "mutability".to_string(),
+                        ty: DeclarationId(871),
+                    },
+                    Field {
+                        label: "purity".to_string(),
+                        ty: DeclarationId(872),
+                    },
+                    Field {
+                        label: "structure".to_string(),
+                        ty: DeclarationId(873),
+                    },
+                    Field {
+                        label: "iteration".to_string(),
+                        ty: DeclarationId(874),
+                    },
                 ],
-                output: DeclarationId(912),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/anthropic_messages.dag",
-                    4627,
-                    4656,
-                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28686,40 +29422,76 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4419, 4656),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 1387, 1500),
         });
         declarations.push(Declaration {
-            id: DeclarationId(892),
-            name: Some("anthropic_operations".to_string()),
+            id: DeclarationId(876),
+            name: Some("dag_model".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1194),
-                }],
+                template: DeclarationId(875),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2097)),
+            meta_tag: Some(DeclarationId(875)),
             specialization_parent: None,
             inhabits: None,
-            value_body: Some(ValueBody::List(vec![])),
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "mutability".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2109),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "purity".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2111),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "structure".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2113),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "iteration".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2115),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6519, 6566),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 1502, 1625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(893),
-            name: Some("AnthropicChatMessage".to_string()),
+            id: DeclarationId(877),
+            name: Some("MemoryModel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "UserMessage".to_string(),
-                        ty: DeclarationId(2099),
+                        label: "ValueOnly".to_string(),
+                        ty: DeclarationId(2117),
                     },
                     Field {
-                        label: "AssistantMessage".to_string(),
-                        ty: DeclarationId(2101),
+                        label: "GarbageCollected".to_string(),
+                        ty: DeclarationId(2118),
+                    },
+                    Field {
+                        label: "RefCounted".to_string(),
+                        ty: DeclarationId(2119),
+                    },
+                    Field {
+                        label: "OwnershipBased".to_string(),
+                        ty: DeclarationId(2120),
                     },
                 ],
             },
@@ -28731,20 +29503,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", 2660, 2822),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 2014, 2099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(894),
-            name: Some("ImageSource".to_string()),
+            id: DeclarationId(878),
+            name: Some("ScopeModel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "Base64Image".to_string(),
-                        ty: DeclarationId(2102),
+                        label: "LexicalScoping".to_string(),
+                        ty: DeclarationId(2121),
                     },
                     Field {
-                        label: "UrlImage".to_string(),
-                        ty: DeclarationId(2103),
+                        label: "DynamicScoping".to_string(),
+                        ty: DeclarationId(2122),
                     },
                 ],
             },
@@ -28756,20 +29528,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", 3190, 3305),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 2365, 2418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(895),
-            name: Some("ContentBlock".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
+            id: DeclarationId(879),
+            name: Some("TargetExecutionModel".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
                     Field {
-                        label: "TextContent".to_string(),
-                        ty: DeclarationId(2104),
+                        label: "memory".to_string(),
+                        ty: DeclarationId(877),
                     },
                     Field {
-                        label: "ImageContent".to_string(),
-                        ty: DeclarationId(2105),
+                        label: "scope".to_string(),
+                        ty: DeclarationId(878),
                     },
                 ],
             },
@@ -28781,15 +29553,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", 3546, 3637),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 2561, 2632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(896),
-            name: Some("CacheControl".to_string()),
+            id: DeclarationId(880),
+            name: Some("SourceFiltering".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
-                    label: "type".to_string(),
-                    ty: DeclarationId(230),
+                    label: "excluded_prefixes".to_string(),
+                    ty: DeclarationId(2123),
                 }],
             },
             type_params: vec![],
@@ -28800,16 +29572,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3804, 3840),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 2774, 2832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(897),
-            name: Some("AnthropicSearchResultCitationsConfig".to_string()),
+            id: DeclarationId(881),
+            name: Some("ShapeATargetSourceFiltering".to_string()),
             connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "enabled".to_string(),
-                    ty: DeclarationId(128),
-                }],
+                children: vec![
+                    Field {
+                        label: "internal".to_string(),
+                        ty: DeclarationId(880),
+                    },
+                    Field {
+                        label: "additional_excluded_prefixes".to_string(),
+                        ty: DeclarationId(2124),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28819,20 +29597,47 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3937, 3998),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 3115, 3224),
         });
         declarations.push(Declaration {
-            id: DeclarationId(898),
-            name: Some("AnthropicToolResultContent".to_string()),
+            id: DeclarationId(882),
+            name: Some("internal_source_filtering".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(880),
+                arguments: vec![],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(880)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![(
+                    "excluded_prefixes".to_string(),
+                    FieldValue::List(vec![
+                        FieldValue::Literal(LiteralBits::String("dsl/std/".to_string())),
+                        FieldValue::Literal(LiteralBits::String("dsl/extdeps/".to_string())),
+                        FieldValue::Literal(LiteralBits::String("src/v3/std/".to_string())),
+                        FieldValue::Literal(LiteralBits::String("src/v3/spec/".to_string())),
+                    ]),
+                )],
+            }),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 3226, 3381),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(883),
+            name: Some("ExecutionModelRequirement".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "ToolResultText".to_string(),
-                        ty: DeclarationId(2106),
+                        label: "OwnershipBased".to_string(),
+                        ty: DeclarationId(2125),
                     },
                     Field {
-                        label: "ToolResultBlocks".to_string(),
-                        ty: DeclarationId(2108),
+                        label: "GarbageCollected".to_string(),
+                        ty: DeclarationId(2126),
                     },
                 ],
             },
@@ -28844,16 +29649,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4296, 4407),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 3659, 3729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(899),
-            name: Some("AnthropicToolResultWireTextTag".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![Field {
-                    label: "Text".to_string(),
-                    ty: DeclarationId(2109),
-                }],
+            id: DeclarationId(884),
+            name: Some("VariantId".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(230),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28863,15 +29666,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", 5576, 5623),
+            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 5139, 5162),
         });
         declarations.push(Declaration {
-            id: DeclarationId(900),
-            name: Some("AnthropicPlainTextDocumentMediaType".to_string()),
+            id: DeclarationId(885),
+            name: Some("WireTagValue".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
-                    label: "TextPlain".to_string(),
-                    ty: DeclarationId(2110),
+                    label: "StringTag".to_string(),
+                    ty: DeclarationId(2127),
                 }],
             },
             type_params: vec![],
@@ -28882,20 +29685,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", 5704, 5761),
+            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 6737, 6786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(901),
-            name: Some("AnthropicToolResultTextBlock".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
+            id: DeclarationId(886),
+            name: Some("FieldProjection".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "type".to_string(),
-                        ty: DeclarationId(899),
+                        label: "Empty".to_string(),
+                        ty: DeclarationId(2128),
                     },
                     Field {
-                        label: "text".to_string(),
-                        ty: DeclarationId(230),
+                        label: "Populated".to_string(),
+                        ty: DeclarationId(2129),
                     },
                 ],
             },
@@ -28907,32 +29710,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", 5852, 5943),
+            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7586, 7630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(902),
-            name: Some("AnthropicToolResultBlock".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "AnthropicTextBlock".to_string(),
-                        ty: DeclarationId(2111),
-                    },
-                    Field {
-                        label: "AnthropicImageBlock".to_string(),
-                        ty: DeclarationId(2112),
-                    },
-                    Field {
-                        label: "AnthropicDocumentBlock".to_string(),
-                        ty: DeclarationId(2113),
-                    },
+            id: DeclarationId(887),
+            name: Some("CoproductVariantProjection".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
                     Field {
-                        label: "AnthropicSearchResultBlock".to_string(),
-                        ty: DeclarationId(2117),
+                        label: "field_projection".to_string(),
+                        ty: DeclarationId(886),
                     },
                     Field {
-                        label: "AnthropicToolReferenceBlock".to_string(),
-                        ty: DeclarationId(2118),
+                        label: "wire_tag_value".to_string(),
+                        ty: DeclarationId(885),
                     },
                 ],
             },
@@ -28944,49 +29735,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5945, 6418),
+            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 8046, 8150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(903),
-            name: Some("AnthropicToolResultPlainTextDocumentSource".to_string()),
+            id: DeclarationId(888),
+            name: Some("CoproductProjection".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "type".to_string(),
-                        ty: DeclarationId(899),
-                    },
-                    Field {
-                        label: "media_type".to_string(),
-                        ty: DeclarationId(900),
+                        label: "declaration".to_string(),
+                        ty: DeclarationId(1330),
                     },
                     Field {
-                        label: "document_data".to_string(),
+                        label: "wire_tag_field".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/anthropic_schema.dag", 6420, 6645),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(904),
-            name: Some("AnthropicUserContentBlock".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "UserTextBlock".to_string(),
-                        ty: DeclarationId(2119),
-                    },
                     Field {
-                        label: "UserToolResultBlock".to_string(),
-                        ty: DeclarationId(2122),
+                        label: "variant_projections".to_string(),
+                        ty: DeclarationId(2130),
                     },
                 ],
             },
@@ -28998,22 +29764,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6891, 7085),
+            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 9395, 9557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(905),
-            name: Some("AnthropicAssistantContentBlock".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "AssistantTextBlock".to_string(),
-                        ty: DeclarationId(2123),
-                    },
-                    Field {
-                        label: "AssistantToolUseBlock".to_string(),
-                        ty: DeclarationId(2124),
-                    },
-                ],
+            id: DeclarationId(889),
+            name: Some("BootstrapFixture".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "virtual_path".to_string(),
+                    ty: DeclarationId(230),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -29023,77 +29783,52 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7492, 7658),
+            span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1395, 1443),
         });
         declarations.push(Declaration {
-            id: DeclarationId(906),
-            name: Some("AnthropicStopReason".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "EndTurn".to_string(),
-                        ty: DeclarationId(2125),
-                    },
-                    Field {
-                        label: "MaxTokens".to_string(),
-                        ty: DeclarationId(2126),
-                    },
+            id: DeclarationId(890),
+            name: Some("BootstrapFixtureSet".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
                     Field {
-                        label: "StopSequence".to_string(),
-                        ty: DeclarationId(2127),
+                        label: "rust_pilot_primitives".to_string(),
+                        ty: DeclarationId(889),
                     },
                     Field {
-                        label: "ToolUse".to_string(),
-                        ty: DeclarationId(2128),
+                        label: "rust_method_template_contracts".to_string(),
+                        ty: DeclarationId(889),
                     },
                     Field {
-                        label: "PauseTurn".to_string(),
-                        ty: DeclarationId(2129),
+                        label: "python_method_template_contracts".to_string(),
+                        ty: DeclarationId(889),
                     },
                     Field {
-                        label: "Refusal".to_string(),
-                        ty: DeclarationId(2130),
+                        label: "go_method_template_contracts".to_string(),
+                        ty: DeclarationId(889),
                     },
                     Field {
-                        label: "ModelContextWindowExceeded".to_string(),
-                        ty: DeclarationId(2131),
+                        label: "anthropic_operations".to_string(),
+                        ty: DeclarationId(889),
                     },
-                ],
-            },
-            type_params: vec![],
-            phantom_params: 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", 7987, 8123),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(907),
-            name: Some("AnthropicMessages200Citation".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
                     Field {
-                        label: "CharLocation".to_string(),
-                        ty: DeclarationId(2134),
+                        label: "cross_target_coverage".to_string(),
+                        ty: DeclarationId(889),
                     },
                     Field {
-                        label: "PageLocation".to_string(),
-                        ty: DeclarationId(2137),
+                        label: "extdeps_cron".to_string(),
+                        ty: DeclarationId(889),
                     },
                     Field {
-                        label: "ContentBlockLocation".to_string(),
-                        ty: DeclarationId(2140),
+                        label: "extdeps_github_github".to_string(),
+                        ty: DeclarationId(889),
                     },
                     Field {
-                        label: "WebSearchResultLocation".to_string(),
-                        ty: DeclarationId(2142),
+                        label: "extdeps_github_actions".to_string(),
+                        ty: DeclarationId(889),
                     },
                     Field {
-                        label: "SearchResultLocation".to_string(),
-                        ty: DeclarationId(2144),
+                        label: "extdeps_github_ci".to_string(),
+                        ty: DeclarationId(889),
                     },
                 ],
             },
@@ -29105,88 +29840,199 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8325, 9071),
+            span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1600, 2062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(908),
-            name: Some("AnthropicMessages200ContentBlock".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "MessagesTextBlock".to_string(),
-                        ty: DeclarationId(2147),
-                    },
-                    Field {
-                        label: "MessagesThinkingBlock".to_string(),
-                        ty: DeclarationId(2148),
-                    },
-                    Field {
-                        label: "MessagesRedactedThinkingBlock".to_string(),
-                        ty: DeclarationId(2149),
-                    },
-                    Field {
-                        label: "MessagesToolUseBlock".to_string(),
-                        ty: DeclarationId(2151),
-                    },
-                    Field {
-                        label: "MessagesServerToolUseBlock".to_string(),
-                        ty: DeclarationId(2153),
-                    },
-                    Field {
-                        label: "MessagesWebSearchToolResultBlock".to_string(),
-                        ty: DeclarationId(2155),
-                    },
-                ],
+            id: DeclarationId(891),
+            name: Some("bootstrap_fixture_authority".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(890),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(890)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9608, 10136),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(909),
-            name: Some("AnthropicServerToolName".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "WebSearch".to_string(),
-                        ty: DeclarationId(2156),
-                    },
-                    Field {
-                        label: "WebFetch".to_string(),
-                        ty: DeclarationId(2157),
-                    },
-                    Field {
-                        label: "CodeExecution".to_string(),
-                        ty: DeclarationId(2158),
-                    },
-                    Field {
-                        label: "BashCodeExecution".to_string(),
-                        ty: DeclarationId(2159),
-                    },
-                    Field {
-                        label: "TextEditorCodeExecution".to_string(),
-                        ty: DeclarationId(2160),
-                    },
-                    Field {
-                        label: "ToolSearchToolRegex".to_string(),
-                        ty: DeclarationId(2161),
-                    },
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "rust_pilot_primitives".to_string(),
+                        FieldValue::Record(vec![(
+                            "virtual_path".to_string(),
+                            FieldValue::Literal(LiteralBits::String(
+                                "dsl/extdeps/languages/rust/primitives.dag".to_string(),
+                            )),
+                        )]),
+                    ),
+                    (
+                        "rust_method_template_contracts".to_string(),
+                        FieldValue::Record(vec![(
+                            "virtual_path".to_string(),
+                            FieldValue::Literal(LiteralBits::String(
+                                "src/v3/std/rust_method_template_contracts.dag".to_string(),
+                            )),
+                        )]),
+                    ),
+                    (
+                        "python_method_template_contracts".to_string(),
+                        FieldValue::Record(vec![(
+                            "virtual_path".to_string(),
+                            FieldValue::Literal(LiteralBits::String(
+                                "src/v3/std/python_method_template_contracts.dag".to_string(),
+                            )),
+                        )]),
+                    ),
+                    (
+                        "go_method_template_contracts".to_string(),
+                        FieldValue::Record(vec![(
+                            "virtual_path".to_string(),
+                            FieldValue::Literal(LiteralBits::String(
+                                "src/v3/std/go_method_template_contracts.dag".to_string(),
+                            )),
+                        )]),
+                    ),
+                    (
+                        "anthropic_operations".to_string(),
+                        FieldValue::Record(vec![(
+                            "virtual_path".to_string(),
+                            FieldValue::Literal(LiteralBits::String(
+                                "src/v3/std/anthropic_operations.dag".to_string(),
+                            )),
+                        )]),
+                    ),
+                    (
+                        "cross_target_coverage".to_string(),
+                        FieldValue::Record(vec![(
+                            "virtual_path".to_string(),
+                            FieldValue::Literal(LiteralBits::String(
+                                "src/v3/std/cross_target_coverage.dag".to_string(),
+                            )),
+                        )]),
+                    ),
+                    (
+                        "extdeps_cron".to_string(),
+                        FieldValue::Record(vec![(
+                            "virtual_path".to_string(),
+                            FieldValue::Literal(LiteralBits::String(
+                                "dsl/extdeps/cron_schedule_model.dag".to_string(),
+                            )),
+                        )]),
+                    ),
+                    (
+                        "extdeps_github_github".to_string(),
+                        FieldValue::Record(vec![(
+                            "virtual_path".to_string(),
+                            FieldValue::Literal(LiteralBits::String(
+                                "dsl/extdeps/github/github.dag".to_string(),
+                            )),
+                        )]),
+                    ),
+                    (
+                        "extdeps_github_actions".to_string(),
+                        FieldValue::Record(vec![(
+                            "virtual_path".to_string(),
+                            FieldValue::Literal(LiteralBits::String(
+                                "dsl/extdeps/github/actions.dag".to_string(),
+                            )),
+                        )]),
+                    ),
+                    (
+                        "extdeps_github_ci".to_string(),
+                        FieldValue::Record(vec![(
+                            "virtual_path".to_string(),
+                            FieldValue::Literal(LiteralBits::String(
+                                "dsl/extdeps/github/ci.dag".to_string(),
+                            )),
+                        )]),
+                    ),
+                ],
+            }),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 2064, 3032),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(892),
+            name: Some("signed_int_diagnostic_order".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1330),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(2131)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::List(vec![
+                FieldValue::Reference(DeclarationId(77)),
+                FieldValue::Reference(DeclarationId(78)),
+                FieldValue::Reference(DeclarationId(79)),
+                FieldValue::Reference(DeclarationId(80)),
+                FieldValue::Reference(DeclarationId(81)),
+            ])),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1200, 1304),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(893),
+            name: Some("unsigned_int_diagnostic_order".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1330),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(2132)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::List(vec![
+                FieldValue::Reference(DeclarationId(82)),
+                FieldValue::Reference(DeclarationId(83)),
+                FieldValue::Reference(DeclarationId(84)),
+                FieldValue::Reference(DeclarationId(85)),
+                FieldValue::Reference(DeclarationId(86)),
+            ])),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1378, 1489),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(894),
+            name: Some("Lookup".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "ToolSearchToolBm25".to_string(),
-                        ty: DeclarationId(2162),
+                        label: "Miss".to_string(),
+                        ty: DeclarationId(2135),
                     },
                     Field {
-                        label: "Advisor".to_string(),
-                        ty: DeclarationId(2163),
+                        label: "Hit".to_string(),
+                        ty: DeclarationId(2136),
                     },
                 ],
             },
+            type_params: vec![DeclarationId(895)],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/lookup.dag", 4521, 4563),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(895),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("value".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -29195,32 +30041,60 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10324, 10506),
+            span: SourceSpan::new("src/v3/std/lookup.dag", 4521, 4563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(910),
-            name: Some("AnthropicMessages200Usage".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "input_tokens".to_string(),
-                        ty: DeclarationId(93),
-                    },
-                    Field {
-                        label: "output_tokens".to_string(),
-                        ty: DeclarationId(93),
-                    },
+            id: DeclarationId(896),
+            name: Some("miss_int_lookup".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![],
+                output: DeclarationId(2133),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4601, 4611)),
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/lookup.dag", 4565, 4611),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(897),
+            name: Some("hit_int_lookup".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(93)],
+                output: DeclarationId(2134),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4654, 4666)),
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/lookup.dag", 4613, 4666),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(898),
+            name: Some("CollectionSizeEffect".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "cache_creation_input_tokens".to_string(),
-                        ty: DeclarationId(2164),
+                        label: "ShrinkEffect".to_string(),
+                        ty: DeclarationId(2161),
                     },
                     Field {
-                        label: "cache_read_input_tokens".to_string(),
-                        ty: DeclarationId(2165),
+                        label: "ProjectionEffect".to_string(),
+                        ty: DeclarationId(2162),
                     },
                     Field {
-                        label: "service_tier".to_string(),
-                        ty: DeclarationId(2166),
+                        label: "IdentityEffect".to_string(),
+                        ty: DeclarationId(2163),
                     },
                 ],
             },
@@ -29232,16 +30106,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10622, 10837),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 4923, 5005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(911),
-            name: Some("AnthropicMessages200Role".to_string()),
+            id: DeclarationId(899),
+            name: Some("CostShape".to_string()),
             connective: TypeConnective::Disj {
-                variants: vec![Field {
-                    label: "Assistant".to_string(),
-                    ty: DeclarationId(2167),
-                }],
+                variants: vec![
+                    Field {
+                        label: "ShapeConstant".to_string(),
+                        ty: DeclarationId(2164),
+                    },
+                    Field {
+                        label: "ShapeLinearScan".to_string(),
+                        ty: DeclarationId(2165),
+                    },
+                    Field {
+                        label: "ShapeIterateBody".to_string(),
+                        ty: DeclarationId(2166),
+                    },
+                    Field {
+                        label: "ShapeSortBody".to_string(),
+                        ty: DeclarationId(2167),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -29251,47 +30139,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11158, 11201),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 5836, 5927),
         });
         declarations.push(Declaration {
-            id: DeclarationId(912),
-            name: Some("AnthropicMessages200Body".to_string()),
+            id: DeclarationId(900),
+            name: Some("MethodContract".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "id".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "type".to_string(),
-                        ty: DeclarationId(230),
+                        label: "algebra_id".to_string(),
+                        ty: DeclarationId(723),
                     },
                     Field {
-                        label: "role".to_string(),
-                        ty: DeclarationId(911),
+                        label: "method_id".to_string(),
+                        ty: DeclarationId(723),
                     },
                     Field {
-                        label: "content".to_string(),
+                        label: "size_effect".to_string(),
                         ty: DeclarationId(2168),
                     },
                     Field {
-                        label: "model".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "stop_reason".to_string(),
-                        ty: DeclarationId(906),
-                    },
-                    Field {
-                        label: "stop_sequence".to_string(),
+                        label: "cost_shape".to_string(),
                         ty: DeclarationId(2169),
                     },
                     Field {
-                        label: "usage".to_string(),
-                        ty: DeclarationId(910),
-                    },
-                    Field {
-                        label: "container".to_string(),
+                        label: "callback_element_position".to_string(),
                         ty: DeclarationId(2170),
                     },
                 ],
@@ -29304,24 +30176,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", 11548, 11879),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 6688, 6862),
         });
         declarations.push(Declaration {
-            id: DeclarationId(913),
-            name: Some("BinShim".to_string()),
+            id: DeclarationId(901),
+            name: Some("SizeVariable".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "entrypoint_name".to_string(),
-                        ty: DeclarationId(151),
-                    },
-                    Field {
-                        label: "description".to_string(),
-                        ty: DeclarationId(230),
+                        label: "source_port".to_string(),
+                        ty: DeclarationId(722),
                     },
                     Field {
-                        label: "entry".to_string(),
-                        ty: DeclarationId(1316),
+                        label: "display_name".to_string(),
+                        ty: DeclarationId(2171),
                     },
                 ],
             },
@@ -29333,58 +30201,126 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/bin_shim.dag", 801, 894),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 7371, 7438),
         });
         declarations.push(Declaration {
-            id: DeclarationId(914),
-            name: Some("BootstrapAuthority".to_string()),
+            id: DeclarationId(902),
+            name: Some("unnamed_size_variable".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(722)],
+                output: DeclarationId(901),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 7502, 7534)),
+            },
+            type_params: vec![],
+            phantom_params: 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", 7440, 7534),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(903),
+            name: Some("size_variable_eq".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(901), DeclarationId(901)],
+                output: DeclarationId(128),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(178))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 7536, 7632),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(904),
+            name: Some("DegreeAtLeastTwo".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "StdAuthority".to_string(),
-                        ty: DeclarationId(2171),
-                    },
-                    Field {
-                        label: "V3StdAuthority".to_string(),
+                        label: "DegreeTwo".to_string(),
                         ty: DeclarationId(2172),
                     },
                     Field {
-                        label: "V3SpecAuthority".to_string(),
+                        label: "DegreeSuccessor".to_string(),
                         ty: DeclarationId(2173),
                     },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: 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", 8379, 8465),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(905),
+            name: Some("SymbolicCost".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "CompilerAuthority".to_string(),
+                        label: "ConstantCost".to_string(),
                         ty: DeclarationId(2174),
                     },
                     Field {
-                        label: "ExtdepsFixtureAuthority".to_string(),
+                        label: "LinearCost".to_string(),
                         ty: DeclarationId(2175),
                     },
+                    Field {
+                        label: "PolynomialCost".to_string(),
+                        ty: DeclarationId(2176),
+                    },
+                    Field {
+                        label: "ProductCost".to_string(),
+                        ty: DeclarationId(2178),
+                    },
+                    Field {
+                        label: "SumCost".to_string(),
+                        ty: DeclarationId(2180),
+                    },
+                    Field {
+                        label: "LogCost".to_string(),
+                        ty: DeclarationId(2181),
+                    },
+                    Field {
+                        label: "UnknownCost".to_string(),
+                        ty: DeclarationId(2182),
+                    },
                 ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: None,
+            inhabits: Some(DeclarationId(2183)),
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 985, 1114),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 9452, 9761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(915),
-            name: Some("BootstrapAuthoritySet".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(137),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(138),
-                        value: DeclarationId(230),
+            id: DeclarationId(906),
+            name: Some("DominateScanAcc".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "any".to_string(),
+                        ty: DeclarationId(128),
                     },
-                    TemplateArgument {
-                        parameter: DeclarationId(139),
-                        value: DeclarationId(914),
+                    Field {
+                        label: "pivot".to_string(),
+                        ty: DeclarationId(905),
                     },
                 ],
             },
@@ -29396,526 +30332,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1299, 1359),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 10167, 10225),
         });
         declarations.push(Declaration {
-            id: DeclarationId(916),
-            name: Some("bootstrap_authority".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
-                arguments: vec![],
+            id: DeclarationId(907),
+            name: Some("dominate_scan_init".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(905)],
+                output: DeclarationId(906),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(181))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: None,
             specialization_parent: None,
             inhabits: None,
-            value_body: Some(ValueBody::Map(
-                FieldMap::from_entries(vec![
-                    (
-                        "dsl/std/logic.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2171),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/bit.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2171),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/error_primitives.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2171),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/algebra.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2171),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/magnitude.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2171),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/machine_constraints.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2171),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/nat.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2171),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/integer.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2171),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/rational.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2171),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/float.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2171),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/types.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2171),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/string_type.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2171),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/unicode.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2171),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/render_repeat_string_bootstrap.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2171),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/methods.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2171),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/serialization.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2171),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/algebra.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/anthropic_messages.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/anthropic_operations.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/anthropic_schema.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/approximate_field.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/bin_shim.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/bootstrap_authority.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/bridge_ledger.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/clean_emission.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/computation.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/computation_model.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/coproduct_projection.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/cross_target_coverage.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/diagnostics.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/dimensions.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/effects.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/emission_provenance.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/emit_model.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/extdeps_bootstrap_fixtures.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/go_method_template_contracts.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/induction.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/integer_diagnostic_order.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/lens.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/lens_application.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/list.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/lookup.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/methods.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/parse_surface.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/python_method_template_contracts.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/resources.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/runtime.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/rust_method_template_contracts.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/services.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/substrate.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/substrate_minimal.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/termination.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/t_ci_workflow_as_data_demo.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/timing_lens.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/tokenize.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/verification.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/workflows.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2172),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/spec/v3_l1.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2173),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/spec/go.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2173),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/spec/python.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2173),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/spec/rust.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2173),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/compiler/pipeline.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2174),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/compiler/operators.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2174),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/compiler/regen.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2174),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/extdeps/languages/rust/primitives.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2175),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/extdeps/cron_schedule_model.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2175),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/extdeps/github/github.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2175),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/extdeps/github/actions.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2175),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/extdeps/github/ci.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2175),
-                            payload: vec![],
-                        },
-                    ),
-                ])
-                .expect("ValueBody::Map"),
-            )),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1361, 4934),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 10227, 10322),
         });
         declarations.push(Declaration {
-            id: DeclarationId(917),
-            name: Some("BridgeStatus".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Retired".to_string(),
-                        ty: DeclarationId(2176),
-                    },
-                    Field {
-                        label: "Open".to_string(),
-                        ty: DeclarationId(2177),
-                    },
-                ],
+            id: DeclarationId(908),
+            name: Some("miss_symbolic_cost_lookup".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![],
+                output: DeclarationId(2137),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 10963, 10973)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -29925,16 +30368,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4697, 4735),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 10908, 10973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(918),
-            name: Some("BridgeLedgerRef".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "decl".to_string(),
-                    ty: DeclarationId(1316),
-                }],
+            id: DeclarationId(909),
+            name: Some("hit_symbolic_cost_lookup".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(905)],
+                output: DeclarationId(2138),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 11047, 11062)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -29944,30 +30386,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 5699, 5746),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 10975, 11062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(919),
-            name: Some("BridgeLedgerRow".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "owner".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "status".to_string(),
-                        ty: DeclarationId(917),
-                    },
-                    Field {
-                        label: "authority".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                ],
+            id: DeclarationId(910),
+            name: Some("two_terms".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(905), DeclarationId(905)],
+                output: DeclarationId(2139),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(185))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -29977,51 +30404,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6389, 6499),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 11064, 11539),
         });
-        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()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "expression_wrapping".to_string(),
-                        ty: DeclarationId(923),
-                    },
-                    Field {
-                        label: "pattern_bindings".to_string(),
-                        ty: DeclarationId(924),
-                    },
-                    Field {
-                        label: "variant_payload_field_access".to_string(),
-                        ty: DeclarationId(925),
-                    },
-                    Field {
-                        label: "imports".to_string(),
-                        ty: DeclarationId(926),
-                    },
-                    Field {
-                        label: "block_return".to_string(),
-                        ty: DeclarationId(927),
-                    },
-                    Field {
-                        label: "variable_bindings".to_string(),
-                        ty: DeclarationId(928),
-                    },
-                    Field {
-                        label: "match_arm_body".to_string(),
-                        ty: DeclarationId(929),
-                    },
-                    Field {
-                        label: "correction_style".to_string(),
-                        ty: DeclarationId(930),
-                    },
-                    Field {
-                        label: "post_emit_verifier".to_string(),
-                        ty: DeclarationId(931),
-                    },
-                ],
+            id: DeclarationId(911),
+            name: Some("many_terms".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(905), DeclarationId(905), DeclarationId(2140)],
+                output: DeclarationId(2141),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(187))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30031,22 +30422,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 562, 944),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 11541, 11726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(922),
-            name: Some("TargetCleanEmissionBinding".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "language".to_string(),
-                        ty: DeclarationId(1051),
-                    },
-                    Field {
-                        label: "clean_emission".to_string(),
-                        ty: DeclarationId(921),
-                    },
-                ],
+            id: DeclarationId(912),
+            name: Some("reject_all_symbolic_costs".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(905)],
+                output: DeclarationId(128),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(192))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30056,26 +30440,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 1748, 1848),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 11728, 11856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(923),
-            name: Some("ExpressionWrappingRule".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "WrapEverything".to_string(),
-                        ty: DeclarationId(2179),
-                    },
-                    Field {
-                        label: "WrapOnlyInOperandPosition".to_string(),
-                        ty: DeclarationId(2180),
-                    },
-                    Field {
-                        label: "NoWrapping".to_string(),
-                        ty: DeclarationId(2181),
-                    },
-                ],
+            id: DeclarationId(913),
+            name: Some("degree_raw".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(904)],
+                output: DeclarationId(93),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(200))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30085,30 +30458,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 2192, 2283),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 11858, 12011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(924),
-            name: Some("PatternBindingRule".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "EmitBindingAlways".to_string(),
-                        ty: DeclarationId(2182),
-                    },
-                    Field {
-                        label: "EmitUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(2183),
-                    },
-                    Field {
-                        label: "EmitPrefixedUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(2184),
-                    },
-                    Field {
-                        label: "NotApplicablePatternBinding".to_string(),
-                        ty: DeclarationId(2185),
-                    },
-                ],
+            id: DeclarationId(914),
+            name: Some("sequential".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(905), DeclarationId(905)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(204))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30118,22 +30476,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 2520, 2663),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 12247, 12350),
         });
         declarations.push(Declaration {
-            id: DeclarationId(925),
-            name: Some("VariantPayloadFieldAccessRule".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "AccessFromPayloadBinding".to_string(),
-                        ty: DeclarationId(2186),
-                    },
-                    Field {
-                        label: "OverrideNamedFieldsAtBindingSite".to_string(),
-                        ty: DeclarationId(2187),
-                    },
-                ],
+            id: DeclarationId(915),
+            name: Some("iterate".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(905), DeclarationId(905)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(208))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30143,26 +30494,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3330, 3430),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 12536, 12654),
         });
         declarations.push(Declaration {
-            id: DeclarationId(926),
-            name: Some("ImportRule".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "ImportEverythingDeclared".to_string(),
-                        ty: DeclarationId(2188),
-                    },
-                    Field {
-                        label: "IncludeOnlyReferenced".to_string(),
-                        ty: DeclarationId(2189),
-                    },
-                    Field {
-                        label: "ImportPerUsageSite".to_string(),
-                        ty: DeclarationId(2190),
-                    },
-                ],
+            id: DeclarationId(916),
+            name: Some("max_path_step".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(905), DeclarationId(905)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(212))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30172,26 +30512,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3544, 3637),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 13514, 13681),
         });
         declarations.push(Declaration {
-            id: DeclarationId(927),
-            name: Some("BlockReturnRule".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "WrapReturnValue".to_string(),
-                        ty: DeclarationId(2191),
-                    },
-                    Field {
-                        label: "NoWrappingOnTerminalExpression".to_string(),
-                        ty: DeclarationId(2192),
-                    },
-                    Field {
-                        label: "ExplicitReturnKeyword".to_string(),
-                        ty: DeclarationId(2193),
-                    },
-                ],
+            id: DeclarationId(917),
+            name: Some("keep_or_sum".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(905), DeclarationId(905)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(216))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30201,26 +30530,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3756, 3857),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 13683, 13841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(928),
-            name: Some("VariableBindingRule".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "EmitLetBindingAlways".to_string(),
-                        ty: DeclarationId(2194),
-                    },
-                    Field {
-                        label: "EmitLetUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(2195),
-                    },
-                    Field {
-                        label: "OmitLetBinding".to_string(),
-                        ty: DeclarationId(2196),
-                    },
-                ],
+            id: DeclarationId(918),
+            name: Some("max_path".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(2142)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(220))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30230,26 +30548,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3995, 4095),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 14143, 14245),
         });
         declarations.push(Declaration {
-            id: DeclarationId(929),
-            name: Some("MatchArmBodyRule".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "WrapBody".to_string(),
-                        ty: DeclarationId(2197),
-                    },
-                    Field {
-                        label: "NoWrappingOnNonComplexBody".to_string(),
-                        ty: DeclarationId(2198),
-                    },
-                    Field {
-                        label: "NotApplicableMatchArmBody".to_string(),
-                        ty: DeclarationId(2199),
-                    },
-                ],
+            id: DeclarationId(919),
+            name: Some("dominates".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(905), DeclarationId(905)],
+                output: DeclarationId(128),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(273))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30259,30 +30566,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 4328, 4423),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 15113, 17198),
         });
         declarations.push(Declaration {
-            id: DeclarationId(930),
-            name: Some("CorrectionStyle".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "indent_unit".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "line_ending".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "string_quote".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "trailing_semicolon".to_string(),
-                        ty: DeclarationId(128),
-                    },
-                ],
+            id: DeclarationId(920),
+            name: Some("same_size_variable".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(901), DeclarationId(901)],
+                output: DeclarationId(128),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(275))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30292,65 +30584,44 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 4736, 4854),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 17200, 17290),
         });
         declarations.push(Declaration {
-            id: DeclarationId(931),
-            name: Some("PostEmitVerifier".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "command".to_string(),
-                        ty: DeclarationId(230),
-                    },
+            id: DeclarationId(921),
+            name: Some("AsymptoticClass".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "args".to_string(),
-                        ty: DeclarationId(2200),
+                        label: "ClassConstant".to_string(),
+                        ty: DeclarationId(2184),
                     },
                     Field {
-                        label: "syntax_only".to_string(),
-                        ty: DeclarationId(128),
+                        label: "ClassLog".to_string(),
+                        ty: DeclarationId(2185),
                     },
                     Field {
-                        label: "expected_exit_code".to_string(),
-                        ty: DeclarationId(93),
+                        label: "ClassLinear".to_string(),
+                        ty: DeclarationId(2186),
                     },
                     Field {
-                        label: "output_policy".to_string(),
-                        ty: DeclarationId(932),
+                        label: "ClassLinearithmic".to_string(),
+                        ty: DeclarationId(2187),
                     },
-                ],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 5270, 5418),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(932),
-            name: Some("VerifierOutputPolicy".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
                     Field {
-                        label: "IgnoreVerifierOutput".to_string(),
-                        ty: DeclarationId(2201),
+                        label: "ClassQuadratic".to_string(),
+                        ty: DeclarationId(2188),
                     },
                     Field {
-                        label: "RequireEmptyStdout".to_string(),
-                        ty: DeclarationId(2202),
+                        label: "ClassPolynomial".to_string(),
+                        ty: DeclarationId(2189),
                     },
                     Field {
-                        label: "RequireEmptyStderr".to_string(),
-                        ty: DeclarationId(2203),
+                        label: "ClassExponential".to_string(),
+                        ty: DeclarationId(2190),
                     },
                     Field {
-                        label: "RequireEmptyStdoutAndStderr".to_string(),
-                        ty: DeclarationId(2204),
+                        label: "ClassUnknown".to_string(),
+                        ty: DeclarationId(2191),
                     },
                 ],
             },
@@ -30358,50 +30629,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: None,
+            inhabits: Some(DeclarationId(2192)),
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 5663, 5791),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 18077, 18318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(933),
-            name: Some("SizeBound".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "CollectionSize".to_string(),
-                        ty: DeclarationId(2211),
-                    },
-                    Field {
-                        label: "ParserStreamSize".to_string(),
-                        ty: DeclarationId(2212),
-                    },
-                    Field {
-                        label: "WorklistDrainSize".to_string(),
-                        ty: DeclarationId(2213),
-                    },
-                    Field {
-                        label: "TreeSize".to_string(),
-                        ty: DeclarationId(2214),
-                    },
-                    Field {
-                        label: "ArithmeticParam".to_string(),
-                        ty: DeclarationId(2215),
-                    },
-                    Field {
-                        label: "ExplicitCountZero".to_string(),
-                        ty: DeclarationId(2216),
-                    },
-                    Field {
-                        label: "ExplicitCountPositive".to_string(),
-                        ty: DeclarationId(2217),
-                    },
-                    Field {
-                        label: "Forever".to_string(),
-                        ty: DeclarationId(2218),
-                    },
-                ],
+            id: DeclarationId(922),
+            name: Some("asymptotic_dominates".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(921), DeclarationId(921)],
+                output: DeclarationId(128),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(345))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30411,19 +30651,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation.dag", 1411, 1707),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 18320, 20588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(934),
-            name: Some("tree_size_bound".to_string()),
+            id: DeclarationId(923),
+            name: Some("meet_asymptotic_class".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(230)],
-                output: DeclarationId(933),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/computation.dag",
-                    1756,
-                    1787,
-                )),
+                inputs: vec![DeclarationId(921), DeclarationId(921)],
+                output: DeclarationId(921),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(348))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30433,46 +30669,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation.dag", 1709, 1787),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 20590, 20721),
         });
         declarations.push(Declaration {
-            id: DeclarationId(935),
-            name: Some("CallPattern".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "ChildAccessorCall".to_string(),
-                        ty: DeclarationId(2219),
-                    },
-                    Field {
-                        label: "CollectionShrinkCall".to_string(),
-                        ty: DeclarationId(2220),
-                    },
-                    Field {
-                        label: "ArithmeticSubtractCall".to_string(),
-                        ty: DeclarationId(2221),
-                    },
-                    Field {
-                        label: "ArithmeticDivideCall".to_string(),
-                        ty: DeclarationId(2222),
-                    },
-                    Field {
-                        label: "ParserAdvanceCall".to_string(),
-                        ty: DeclarationId(2223),
-                    },
-                    Field {
-                        label: "WorklistDrainCall".to_string(),
-                        ty: DeclarationId(2224),
-                    },
-                    Field {
-                        label: "FoldBodyCall".to_string(),
-                        ty: DeclarationId(2225),
-                    },
-                    Field {
-                        label: "SameArgumentCall".to_string(),
-                        ty: DeclarationId(2226),
-                    },
-                ],
+            id: DeclarationId(924),
+            name: Some("join_asymptotic_class".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(921), DeclarationId(921)],
+                output: DeclarationId(921),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(351))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30482,19 +30687,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation.dag", 2038, 2485),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 20723, 20854),
         });
         declarations.push(Declaration {
-            id: DeclarationId(936),
-            name: Some("per_call_pattern_at".to_string()),
+            id: DeclarationId(925),
+            name: Some("classify_symbolic_cost".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(2205),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/computation.dag",
-                    2764,
-                    2794,
-                )),
+                inputs: vec![DeclarationId(905)],
+                output: DeclarationId(921),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 20921, 20954)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30504,19 +30705,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation.dag", 2698, 2794),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 20856, 20954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(937),
-            name: Some("per_call_descent_operand_port".to_string()),
+            id: DeclarationId(926),
+            name: Some("normalize".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(2206),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/computation.dag",
-                    2969,
-                    3009,
-                )),
+                inputs: vec![DeclarationId(905)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(360))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30526,26 +30723,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation.dag", 2898, 3009),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 21828, 22193),
         });
         declarations.push(Declaration {
-            id: DeclarationId(938),
-            name: Some("ShrinkFactor".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "UnitShrink".to_string(),
-                        ty: DeclarationId(2227),
-                    },
-                    Field {
-                        label: "ConstantShrink".to_string(),
-                        ty: DeclarationId(2228),
-                    },
-                    Field {
-                        label: "ProportionalShrink".to_string(),
-                        ty: DeclarationId(2229),
-                    },
-                ],
+            id: DeclarationId(927),
+            name: Some("nsl_to_list".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(2143)],
+                output: DeclarationId(2144),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(366))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30555,26 +30741,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation.dag", 3199, 3339),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 22195, 22324),
         });
         declarations.push(Declaration {
-            id: DeclarationId(939),
-            name: Some("IterationPrimitive".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Fold".to_string(),
-                        ty: DeclarationId(2230),
-                    },
-                    Field {
-                        label: "Descend".to_string(),
-                        ty: DeclarationId(2231),
-                    },
-                    Field {
-                        label: "Repeat".to_string(),
-                        ty: DeclarationId(2232),
-                    },
-                ],
+            id: DeclarationId(928),
+            name: Some("drop_additive_zero".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(2145)],
+                output: DeclarationId(2146),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(379))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30584,30 +30759,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation.dag", 3501, 3556),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 22501, 22793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(940),
-            name: Some("LoweringTarget".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "primitive".to_string(),
-                        ty: DeclarationId(939),
-                    },
-                    Field {
-                        label: "bound".to_string(),
-                        ty: DeclarationId(933),
-                    },
-                    Field {
-                        label: "evidence".to_string(),
-                        ty: DeclarationId(1213),
-                    },
-                    Field {
-                        label: "factor".to_string(),
-                        ty: DeclarationId(2233),
-                    },
-                ],
+            id: DeclarationId(929),
+            name: Some("collapse_on_multiplicative_zero".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(2147)],
+                output: DeclarationId(2148),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(386))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30617,19 +30777,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation.dag", 3748, 3874),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 23002, 23165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(941),
-            name: Some("lower_call_pattern".to_string()),
+            id: DeclarationId(930),
+            name: Some("any_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(935)],
-                output: DeclarationId(940),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/computation.dag",
-                    4185,
-                    5736,
-                )),
+                inputs: vec![DeclarationId(2149)],
+                output: DeclarationId(128),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(395))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30639,19 +30795,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation.dag", 4123, 5736),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 23167, 23332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(942),
-            name: Some("size_bound_param".to_string()),
+            id: DeclarationId(931),
+            name: Some("drop_multiplicative_one".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(933)],
-                output: DeclarationId(2207),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/computation.dag",
-                    5787,
-                    6212,
-                )),
+                inputs: vec![DeclarationId(2150)],
+                output: DeclarationId(2151),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(408))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30661,19 +30813,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation.dag", 5738, 6212),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 23490, 23796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(943),
-            name: Some("is_constant_bound".to_string()),
+            id: DeclarationId(932),
+            name: Some("is_zero_constant".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(933)],
+                inputs: vec![DeclarationId(905)],
                 output: DeclarationId(128),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/computation.dag",
-                    6261,
-                    6432,
-                )),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(418))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30683,19 +30831,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation.dag", 6214, 6432),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 23798, 24052),
         });
         declarations.push(Declaration {
-            id: DeclarationId(944),
-            name: Some("forever_iteration_bound".to_string()),
+            id: DeclarationId(933),
+            name: Some("is_one_constant".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(93),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/computation.dag",
-                    6549,
-                    6572,
-                )),
+                inputs: vec![DeclarationId(905)],
+                output: DeclarationId(128),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(428))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30705,19 +30849,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation.dag", 6513, 6572),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 24054, 24307),
         });
         declarations.push(Declaration {
-            id: DeclarationId(945),
-            name: Some("constant_bound_value".to_string()),
+            id: DeclarationId(934),
+            name: Some("reduce_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(933)],
-                output: DeclarationId(2208),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/computation.dag",
-                    6715,
-                    6980,
-                )),
+                inputs: vec![DeclarationId(2152)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(440))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30727,26 +30867,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation.dag", 6665, 6980),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 25092, 25363),
         });
         declarations.push(Declaration {
-            id: DeclarationId(946),
-            name: Some("IterationDimension".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "TreeDescent".to_string(),
-                        ty: DeclarationId(2234),
-                    },
-                    Field {
-                        label: "CollectionFold".to_string(),
-                        ty: DeclarationId(2235),
-                    },
-                    Field {
-                        label: "ArithmeticRepeat".to_string(),
-                        ty: DeclarationId(2236),
-                    },
-                ],
+            id: DeclarationId(935),
+            name: Some("wrap_sum".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(2153)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(452))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30756,19 +30885,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation.dag", 7465, 7648),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 25365, 25640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(947),
-            name: Some("algebra_profile_to_dimension".to_string()),
+            id: DeclarationId(936),
+            name: Some("reduce_product".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(53)],
-                output: DeclarationId(2209),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/computation.dag",
-                    7781,
-                    8274,
-                )),
+                inputs: vec![DeclarationId(2154)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(469))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30778,19 +30903,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation.dag", 7701, 8274),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 25825, 26246),
         });
         declarations.push(Declaration {
-            id: DeclarationId(948),
-            name: Some("type_iteration_dimension".to_string()),
+            id: DeclarationId(937),
+            name: Some("combine_binary_product".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(230)],
-                output: DeclarationId(2210),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/computation.dag",
-                    8346,
-                    8565,
-                )),
+                inputs: vec![DeclarationId(905), DeclarationId(905)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(478))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30800,22 +30921,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation.dag", 8276, 8565),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 26411, 26798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(949),
-            name: Some("Mutability".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Immutable".to_string(),
-                        ty: DeclarationId(2237),
-                    },
-                    Field {
-                        label: "Mutable".to_string(),
-                        ty: DeclarationId(2238),
-                    },
-                ],
+            id: DeclarationId(938),
+            name: Some("combine_linear_with".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(901), DeclarationId(905), DeclarationId(905)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(487))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30825,22 +30939,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 340, 381),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 26800, 27209),
         });
         declarations.push(Declaration {
-            id: DeclarationId(950),
-            name: Some("Purity".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Pure".to_string(),
-                        ty: DeclarationId(2239),
-                    },
-                    Field {
-                        label: "Effectful".to_string(),
-                        ty: DeclarationId(2240),
-                    },
+            id: DeclarationId(939),
+            name: Some("collapse_linear_square".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![
+                    DeclarationId(901),
+                    DeclarationId(901),
+                    DeclarationId(905),
+                    DeclarationId(905),
                 ],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(492))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30850,22 +30962,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 598, 632),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 27211, 27427),
         });
         declarations.push(Declaration {
-            id: DeclarationId(951),
-            name: Some("Structure".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "ExplicitDAG".to_string(),
-                        ty: DeclarationId(2241),
-                    },
-                    Field {
-                        label: "Arbitrary".to_string(),
-                        ty: DeclarationId(2242),
-                    },
-                ],
+            id: DeclarationId(940),
+            name: Some("polynomial_square".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(901)],
+                output: DeclarationId(905),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 27483, 27533)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30875,22 +30980,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 891, 935),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 27429, 27533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(952),
-            name: Some("Iteration".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Bounded".to_string(),
-                        ty: DeclarationId(2243),
-                    },
-                    Field {
-                        label: "Unbounded".to_string(),
-                        ty: DeclarationId(2244),
-                    },
-                ],
+            id: DeclarationId(941),
+            name: Some("product_pair".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(905), DeclarationId(905)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(495))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30900,30 +30998,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 1147, 1187),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 27535, 27633),
         });
         declarations.push(Declaration {
-            id: DeclarationId(953),
-            name: Some("ComputationModel".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "mutability".to_string(),
-                        ty: DeclarationId(949),
-                    },
-                    Field {
-                        label: "purity".to_string(),
-                        ty: DeclarationId(950),
-                    },
-                    Field {
-                        label: "structure".to_string(),
-                        ty: DeclarationId(951),
-                    },
-                    Field {
-                        label: "iteration".to_string(),
-                        ty: DeclarationId(952),
-                    },
-                ],
+            id: DeclarationId(942),
+            name: Some("fold_or_dominate_scan".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(906), DeclarationId(905)],
+                output: DeclarationId(906),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(502))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30933,76 +31016,100 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 1387, 1500),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 27635, 27784),
         });
         declarations.push(Declaration {
-            id: DeclarationId(954),
-            name: Some("dag_model".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(953),
-                arguments: vec![],
+            id: DeclarationId(943),
+            name: Some("scan_hit".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(906)],
+                output: DeclarationId(128),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(504))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(953)),
+            meta_tag: None,
             specialization_parent: None,
             inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "mutability".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2237),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "purity".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2239),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "structure".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2241),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "iteration".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2243),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 1502, 1625),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 27786, 27841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(955),
-            name: Some("MemoryModel".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
+            id: DeclarationId(944),
+            name: Some("filter_not_dominated_by".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(2155), DeclarationId(905)],
+                output: DeclarationId(2156),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(517))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 27843, 28205),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(945),
+            name: Some("drop_dominated_step".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(2157), DeclarationId(905)],
+                output: DeclarationId(2158),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(524))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 28207, 28449),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(946),
+            name: Some("drop_dominated".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(2159)],
+                output: DeclarationId(2160),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(527))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 28637, 28749),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(947),
+            name: Some("ResourceHandle".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
                     Field {
-                        label: "ValueOnly".to_string(),
-                        ty: DeclarationId(2245),
+                        label: "type".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(2246),
+                        label: "resource_id".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "RefCounted".to_string(),
-                        ty: DeclarationId(2247),
+                        label: "key".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(2248),
+                        label: "cap".to_string(),
+                        ty: DeclarationId(147),
                     },
                 ],
             },
@@ -31014,22 +31121,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 2014, 2099),
+            span: SourceSpan::new("src/v3/std/resources.dag", 739, 827),
         });
         declarations.push(Declaration {
-            id: DeclarationId(956),
-            name: Some("ScopeModel".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "LexicalScoping".to_string(),
-                        ty: DeclarationId(2249),
-                    },
-                    Field {
-                        label: "DynamicScoping".to_string(),
-                        ty: DeclarationId(2250),
-                    },
-                ],
+            id: DeclarationId(948),
+            name: Some("ResourceReference".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "target".to_string(),
+                    ty: DeclarationId(1330),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -31039,20 +31140,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 2365, 2418),
+            span: SourceSpan::new("src/v3/std/resources.dag", 829, 880),
         });
         declarations.push(Declaration {
-            id: DeclarationId(957),
-            name: Some("TargetExecutionModel".to_string()),
+            id: DeclarationId(949),
+            name: Some("InputField".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/services.dag", 3669, 3687),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(950),
+            name: Some("RestEndpointBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "memory".to_string(),
-                        ty: DeclarationId(955),
+                        label: "method".to_string(),
+                        ty: DeclarationId(198),
                     },
                     Field {
-                        label: "scope".to_string(),
-                        ty: DeclarationId(956),
+                        label: "path".to_string(),
+                        ty: DeclarationId(730),
                     },
                 ],
             },
@@ -31064,15 +31179,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 2561, 2632),
+            span: SourceSpan::new("src/v3/std/services.dag", 4599, 4671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(958),
-            name: Some("SourceFiltering".to_string()),
+            id: DeclarationId(951),
+            name: Some("CallableRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
-                    label: "excluded_prefixes".to_string(),
-                    ty: DeclarationId(2251),
+                    label: "decl".to_string(),
+                    ty: DeclarationId(1330),
                 }],
             },
             type_params: vec![],
@@ -31083,20 +31198,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 2774, 2832),
+            span: SourceSpan::new("src/v3/std/services.dag", 5479, 5522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(959),
-            name: Some("ShapeATargetSourceFiltering".to_string()),
+            id: DeclarationId(952),
+            name: Some("Operation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "internal".to_string(),
-                        ty: DeclarationId(958),
+                        label: "callable".to_string(),
+                        ty: DeclarationId(951),
                     },
                     Field {
-                        label: "additional_excluded_prefixes".to_string(),
-                        ty: DeclarationId(2252),
+                        label: "inputs".to_string(),
+                        ty: DeclarationId(2220),
+                    },
+                    Field {
+                        label: "endpoint".to_string(),
+                        ty: DeclarationId(950),
                     },
                 ],
             },
@@ -31108,47 +31227,64 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 3115, 3224),
+            span: SourceSpan::new("src/v3/std/services.dag", 6731, 6841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(960),
-            name: Some("internal_source_filtering".to_string()),
+            id: DeclarationId(953),
+            name: Some("anthropic_operations".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(958),
-                arguments: vec![],
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(952),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(958)),
+            meta_tag: Some(DeclarationId(2221)),
             specialization_parent: None,
             inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![(
-                    "excluded_prefixes".to_string(),
-                    FieldValue::List(vec![
-                        FieldValue::Literal(LiteralBits::String("dsl/std/".to_string())),
-                        FieldValue::Literal(LiteralBits::String("dsl/extdeps/".to_string())),
-                        FieldValue::Literal(LiteralBits::String("src/v3/std/".to_string())),
-                        FieldValue::Literal(LiteralBits::String("src/v3/spec/".to_string())),
-                    ]),
-                )],
-            }),
+            value_body: Some(ValueBody::List(vec![])),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 3226, 3381),
+            span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6519, 6566),
         });
         declarations.push(Declaration {
-            id: DeclarationId(961),
-            name: Some("ExecutionModelRequirement".to_string()),
+            id: DeclarationId(954),
+            name: Some("SizeBound".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(2253),
+                        label: "CollectionSize".to_string(),
+                        ty: DeclarationId(2228),
                     },
                     Field {
-                        label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(2254),
+                        label: "ParserStreamSize".to_string(),
+                        ty: DeclarationId(2229),
+                    },
+                    Field {
+                        label: "WorklistDrainSize".to_string(),
+                        ty: DeclarationId(2230),
+                    },
+                    Field {
+                        label: "TreeSize".to_string(),
+                        ty: DeclarationId(2231),
+                    },
+                    Field {
+                        label: "ArithmeticParam".to_string(),
+                        ty: DeclarationId(2232),
+                    },
+                    Field {
+                        label: "ExplicitCountZero".to_string(),
+                        ty: DeclarationId(2233),
+                    },
+                    Field {
+                        label: "ExplicitCountPositive".to_string(),
+                        ty: DeclarationId(2234),
+                    },
+                    Field {
+                        label: "Forever".to_string(),
+                        ty: DeclarationId(2235),
                     },
                 ],
             },
@@ -31160,14 +31296,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 3659, 3729),
+            span: SourceSpan::new("src/v3/std/computation.dag", 1411, 1707),
         });
         declarations.push(Declaration {
-            id: DeclarationId(962),
-            name: Some("VariantId".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(230),
-                arguments: vec![],
+            id: DeclarationId(955),
+            name: Some("tree_size_bound".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(954),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/computation.dag",
+                    1756,
+                    1787,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -31177,16 +31318,46 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 5139, 5162),
+            span: SourceSpan::new("src/v3/std/computation.dag", 1709, 1787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(963),
-            name: Some("WireTagValue".to_string()),
+            id: DeclarationId(956),
+            name: Some("CallPattern".to_string()),
             connective: TypeConnective::Disj {
-                variants: vec![Field {
-                    label: "StringTag".to_string(),
-                    ty: DeclarationId(2255),
-                }],
+                variants: vec![
+                    Field {
+                        label: "ChildAccessorCall".to_string(),
+                        ty: DeclarationId(2236),
+                    },
+                    Field {
+                        label: "CollectionShrinkCall".to_string(),
+                        ty: DeclarationId(2237),
+                    },
+                    Field {
+                        label: "ArithmeticSubtractCall".to_string(),
+                        ty: DeclarationId(2238),
+                    },
+                    Field {
+                        label: "ArithmeticDivideCall".to_string(),
+                        ty: DeclarationId(2239),
+                    },
+                    Field {
+                        label: "ParserAdvanceCall".to_string(),
+                        ty: DeclarationId(2240),
+                    },
+                    Field {
+                        label: "WorklistDrainCall".to_string(),
+                        ty: DeclarationId(2241),
+                    },
+                    Field {
+                        label: "FoldBodyCall".to_string(),
+                        ty: DeclarationId(2242),
+                    },
+                    Field {
+                        label: "SameArgumentCall".to_string(),
+                        ty: DeclarationId(2243),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -31196,20 +31367,68 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 6737, 6786),
+            span: SourceSpan::new("src/v3/std/computation.dag", 2038, 2485),
         });
         declarations.push(Declaration {
-            id: DeclarationId(964),
-            name: Some("FieldProjection".to_string()),
+            id: DeclarationId(957),
+            name: Some("per_call_pattern_at".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(721)],
+                output: DeclarationId(2222),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/computation.dag",
+                    2764,
+                    2794,
+                )),
+            },
+            type_params: vec![],
+            phantom_params: 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", 2698, 2794),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(958),
+            name: Some("per_call_descent_operand_port".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(721)],
+                output: DeclarationId(2223),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/computation.dag",
+                    2969,
+                    3009,
+                )),
+            },
+            type_params: vec![],
+            phantom_params: 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", 2898, 3009),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(959),
+            name: Some("ShrinkFactor".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "Empty".to_string(),
-                        ty: DeclarationId(2256),
+                        label: "UnitShrink".to_string(),
+                        ty: DeclarationId(2244),
                     },
                     Field {
-                        label: "Populated".to_string(),
-                        ty: DeclarationId(2257),
+                        label: "ConstantShrink".to_string(),
+                        ty: DeclarationId(2245),
+                    },
+                    Field {
+                        label: "ProportionalShrink".to_string(),
+                        ty: DeclarationId(2246),
                     },
                 ],
             },
@@ -31221,20 +31440,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7586, 7630),
+            span: SourceSpan::new("src/v3/std/computation.dag", 3199, 3339),
         });
         declarations.push(Declaration {
-            id: DeclarationId(965),
-            name: Some("CoproductVariantProjection".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
+            id: DeclarationId(960),
+            name: Some("IterationPrimitive".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "field_projection".to_string(),
-                        ty: DeclarationId(964),
+                        label: "Fold".to_string(),
+                        ty: DeclarationId(2247),
                     },
                     Field {
-                        label: "wire_tag_value".to_string(),
-                        ty: DeclarationId(963),
+                        label: "Descend".to_string(),
+                        ty: DeclarationId(2248),
+                    },
+                    Field {
+                        label: "Repeat".to_string(),
+                        ty: DeclarationId(2249),
                     },
                 ],
             },
@@ -31246,24 +31469,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 8046, 8150),
+            span: SourceSpan::new("src/v3/std/computation.dag", 3501, 3556),
         });
         declarations.push(Declaration {
-            id: DeclarationId(966),
-            name: Some("CoproductProjection".to_string()),
+            id: DeclarationId(961),
+            name: Some("LoweringTarget".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "declaration".to_string(),
-                        ty: DeclarationId(1316),
+                        label: "primitive".to_string(),
+                        ty: DeclarationId(960),
                     },
                     Field {
-                        label: "wire_tag_field".to_string(),
-                        ty: DeclarationId(230),
+                        label: "bound".to_string(),
+                        ty: DeclarationId(954),
                     },
                     Field {
-                        label: "variant_projections".to_string(),
-                        ty: DeclarationId(2258),
+                        label: "evidence".to_string(),
+                        ty: DeclarationId(1140),
+                    },
+                    Field {
+                        label: "factor".to_string(),
+                        ty: DeclarationId(2250),
                     },
                 ],
             },
@@ -31275,14 +31502,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 9395, 9557),
+            span: SourceSpan::new("src/v3/std/computation.dag", 3748, 3874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(967),
-            name: Some("ShapeATarget".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1051),
-                arguments: vec![],
+            id: DeclarationId(962),
+            name: Some("lower_call_pattern".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(956)],
+                output: DeclarationId(961),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/computation.dag",
+                    4185,
+                    5736,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -31292,99 +31524,268 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 2839, 2871),
+            span: SourceSpan::new("src/v3/std/computation.dag", 4123, 5736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(968),
-            name: Some("rust_shape_a_target".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(967),
-                arguments: vec![],
+            id: DeclarationId(963),
+            name: Some("size_bound_param".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(954)],
+                output: DeclarationId(2224),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/computation.dag",
+                    5787,
+                    6212,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(967)),
+            meta_tag: None,
             specialization_parent: None,
             inhabits: None,
-            value_body: Some(ValueBody::Unparsed(SourceSpan::new(
-                "src/v3/std/cross_target_coverage.dag",
-                2914,
-                2927,
-            ))),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 2873, 2927),
+            span: SourceSpan::new("src/v3/std/computation.dag", 5738, 6212),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(964),
+            name: Some("is_constant_bound".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(954)],
+                output: DeclarationId(128),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/computation.dag",
+                    6261,
+                    6432,
+                )),
+            },
+            type_params: vec![],
+            phantom_params: 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", 6214, 6432),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(965),
+            name: Some("forever_iteration_bound".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![],
+                output: DeclarationId(93),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/computation.dag",
+                    6549,
+                    6572,
+                )),
+            },
+            type_params: vec![],
+            phantom_params: 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", 6513, 6572),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(966),
+            name: Some("constant_bound_value".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(954)],
+                output: DeclarationId(2225),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/computation.dag",
+                    6715,
+                    6980,
+                )),
+            },
+            type_params: vec![],
+            phantom_params: 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", 6665, 6980),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(967),
+            name: Some("IterationDimension".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "TreeDescent".to_string(),
+                        ty: DeclarationId(2251),
+                    },
+                    Field {
+                        label: "CollectionFold".to_string(),
+                        ty: DeclarationId(2252),
+                    },
+                    Field {
+                        label: "ArithmeticRepeat".to_string(),
+                        ty: DeclarationId(2253),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: 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", 7465, 7648),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(968),
+            name: Some("algebra_profile_to_dimension".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(53)],
+                output: DeclarationId(2226),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/computation.dag",
+                    7781,
+                    8274,
+                )),
+            },
+            type_params: vec![],
+            phantom_params: 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", 7701, 8274),
         });
         declarations.push(Declaration {
             id: DeclarationId(969),
-            name: Some("python_shape_a_target".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(967),
-                arguments: vec![],
+            name: Some("type_iteration_dimension".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(2227),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/computation.dag",
+                    8346,
+                    8565,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(967)),
+            meta_tag: None,
             specialization_parent: None,
             inhabits: None,
-            value_body: Some(ValueBody::Unparsed(SourceSpan::new(
-                "src/v3/std/cross_target_coverage.dag",
-                2971,
-                2986,
-            ))),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 2928, 2986),
+            span: SourceSpan::new("src/v3/std/computation.dag", 8276, 8565),
         });
         declarations.push(Declaration {
             id: DeclarationId(970),
-            name: Some("go_shape_a_target".to_string()),
+            name: Some("EmissionRule".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(967),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(967)),
+            meta_tag: None,
             specialization_parent: None,
             inhabits: None,
-            value_body: Some(ValueBody::Unparsed(SourceSpan::new(
-                "src/v3/std/cross_target_coverage.dag",
-                3026,
-                3037,
-            ))),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 2987, 3037),
+            span: SourceSpan::new("src/v3/std/emission_provenance.dag", 2797, 2823),
         });
         declarations.push(Declaration {
             id: DeclarationId(971),
-            name: Some("FormAxis".to_string()),
+            name: Some("OptionalSourceSpan".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "Atom".to_string(),
-                        ty: DeclarationId(2259),
+                        label: "NoSourceSpan".to_string(),
+                        ty: DeclarationId(2254),
                     },
                     Field {
-                        label: "Conj".to_string(),
-                        ty: DeclarationId(2260),
+                        label: "SomeSourceSpan".to_string(),
+                        ty: DeclarationId(2255),
                     },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3681, 3762),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(972),
+            name: Some("EmissionProvenance".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
                     Field {
-                        label: "Disj".to_string(),
-                        ty: DeclarationId(2261),
+                        label: "emitted_line".to_string(),
+                        ty: DeclarationId(98),
                     },
                     Field {
-                        label: "Arrow".to_string(),
-                        ty: DeclarationId(2262),
+                        label: "rule".to_string(),
+                        ty: DeclarationId(970),
                     },
                     Field {
-                        label: "Cardinality".to_string(),
-                        ty: DeclarationId(2263),
+                        label: "source_span".to_string(),
+                        ty: DeclarationId(971),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/emission_provenance.dag", 4898, 5008),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(973),
+            name: Some("TypeRealization".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "language".to_string(),
+                        ty: DeclarationId(1330),
                     },
                     Field {
-                        label: "Instantiation".to_string(),
-                        ty: DeclarationId(2264),
+                        label: "target".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "carrier".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "is_copy".to_string(),
+                        ty: DeclarationId(128),
+                    },
+                    Field {
+                        label: "fields".to_string(),
+                        ty: DeclarationId(2256),
+                    },
+                    Field {
+                        label: "cost".to_string(),
+                        ty: DeclarationId(93),
                     },
                 ],
             },
@@ -31396,32 +31797,90 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3837, 3909),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 736, 887),
         });
         declarations.push(Declaration {
-            id: DeclarationId(972),
-            name: Some("BehaviorAxis".to_string()),
+            id: DeclarationId(974),
+            name: Some("TargetIntegerTypeInhabitance".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "language".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "kernel_integer".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "algebra".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "bound".to_string(),
+                        ty: DeclarationId(975),
+                    },
+                    Field {
+                        label: "type_realization".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: 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", 2385, 2840),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(975),
+            name: Some("TargetIntegerInhabitanceBound".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "Value".to_string(),
-                        ty: DeclarationId(2265),
+                        label: "BoundUnspecified".to_string(),
+                        ty: DeclarationId(2257),
                     },
                     Field {
-                        label: "Transform".to_string(),
-                        ty: DeclarationId(2266),
+                        label: "StaticBoundFact".to_string(),
+                        ty: DeclarationId(2258),
                     },
                     Field {
-                        label: "Branch".to_string(),
-                        ty: DeclarationId(2267),
+                        label: "PlatformDependentFact".to_string(),
+                        ty: DeclarationId(2259),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: 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", 4334, 4686),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(976),
+            name: Some("FieldBinding".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "dag_name".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "Loop".to_string(),
-                        ty: DeclarationId(2268),
+                        label: "access".to_string(),
+                        ty: DeclarationId(977),
                     },
                     Field {
-                        label: "Bind".to_string(),
-                        ty: DeclarationId(2269),
+                        label: "borrowed_read".to_string(),
+                        ty: DeclarationId(128),
                     },
                 ],
             },
@@ -31433,20 +31892,57 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4469, 4529),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 4688, 4772),
         });
         declarations.push(Declaration {
-            id: DeclarationId(973),
-            name: Some("MethodTemplateContractKey".to_string()),
+            id: DeclarationId(977),
+            name: Some("FieldAccess".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "DirectField".to_string(),
+                        ty: DeclarationId(2260),
+                    },
+                    Field {
+                        label: "AccessorMethod".to_string(),
+                        ty: DeclarationId(2261),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: 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", 5155, 5222),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(978),
+            name: Some("OperatorRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
+                    Field {
+                        label: "language".to_string(),
+                        ty: DeclarationId(1330),
+                    },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(967),
+                        ty: DeclarationId(1330),
                     },
                     Field {
-                        label: "dag_method".to_string(),
-                        ty: DeclarationId(841),
+                        label: "op".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "carrier".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "cost".to_string(),
+                        ty: DeclarationId(93),
                     },
                 ],
             },
@@ -31458,20 +31954,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4913, 4994),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 5224, 5355),
         });
         declarations.push(Declaration {
-            id: DeclarationId(974),
-            name: Some("EmissionCell".to_string()),
+            id: DeclarationId(979),
+            name: Some("BehaviorRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "connective".to_string(),
-                        ty: DeclarationId(971),
+                        label: "language".to_string(),
+                        ty: DeclarationId(1330),
                     },
                     Field {
-                        label: "behavior".to_string(),
-                        ty: DeclarationId(972),
+                        label: "target".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "carrier".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "cost".to_string(),
+                        ty: DeclarationId(93),
                     },
                 ],
             },
@@ -31483,20 +31987,32 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5427, 5496),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 5357, 5467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(975),
-            name: Some("EmissionPathProjection".to_string()),
+            id: DeclarationId(980),
+            name: Some("CallableRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "row_identity".to_string(),
-                        ty: DeclarationId(973),
+                        label: "language".to_string(),
+                        ty: DeclarationId(1330),
                     },
                     Field {
-                        label: "cells".to_string(),
-                        ty: DeclarationId(2270),
+                        label: "target".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "strategy".to_string(),
+                        ty: DeclarationId(989),
+                    },
+                    Field {
+                        label: "parameters".to_string(),
+                        ty: DeclarationId(2262),
+                    },
+                    Field {
+                        label: "cost".to_string(),
+                        ty: DeclarationId(93),
                     },
                 ],
             },
@@ -31508,1590 +32024,760 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5842, 5943),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 5469, 5628),
         });
         declarations.push(Declaration {
-            id: DeclarationId(976),
-            name: Some("emission_path_projections".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(975),
-                }],
+            id: DeclarationId(981),
+            name: Some("CallableParameter".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "slot".to_string(),
+                        ty: DeclarationId(93),
+                    },
+                    Field {
+                        label: "disposition".to_string(),
+                        ty: DeclarationId(982),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2271)),
+            meta_tag: None,
             specialization_parent: None,
             inhabits: None,
-            value_body: Some(ValueBody::List(vec![
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(968)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(258)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(968)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(271)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(968)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(295)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(968)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(273)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(968)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(264)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(968)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(262)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(968)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(252)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(968)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(263)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(968)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(249)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(968)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(248)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(968)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(265)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(968)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(293)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(968)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(299)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(258)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(271)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(295)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(273)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(264)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(262)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(252)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(263)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(249)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(248)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(265)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(293)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(299)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(294)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(250)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(297)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(970)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(258)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(970)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(271)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(970)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(295)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(970)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(263)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(970)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(249)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(970)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(248)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(970)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(265)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(970)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(293)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(970)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(299)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(970)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(294)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(970)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(250)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(970)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(297)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2263),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2266),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-            ])),
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 6050, 6124),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(982),
+            name: Some("ParameterDisposition".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "Borrowed".to_string(),
+                        ty: DeclarationId(2263),
+                    },
+                    Field {
+                        label: "Consumed".to_string(),
+                        ty: DeclarationId(2264),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: 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", 6581, 6632),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(983),
+            name: Some("StringOwnershipAxis".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "Owned".to_string(),
+                        ty: DeclarationId(2265),
+                    },
+                    Field {
+                        label: "Borrowed".to_string(),
+                        ty: DeclarationId(2266),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: 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", 7044, 7091),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(984),
+            name: Some("StringLifetimeAxis".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "SelfContained".to_string(),
+                        ty: DeclarationId(2267),
+                    },
+                    Field {
+                        label: "Caller".to_string(),
+                        ty: DeclarationId(2268),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: 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", 7399, 7451),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(985),
+            name: Some("StringGrowabilityAxis".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "Growable".to_string(),
+                        ty: DeclarationId(2269),
+                    },
+                    Field {
+                        label: "Fixed".to_string(),
+                        ty: DeclarationId(2270),
+                    },
+                    Field {
+                        label: "NotApplicable".to_string(),
+                        ty: DeclarationId(2271),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: 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", 7678, 7745),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(986),
+            name: Some("StringEncodingAxis".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![Field {
+                    label: "Utf8FreeMonoidChar".to_string(),
+                    ty: DeclarationId(2272),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: 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", 8054, 8100),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(987),
+            name: Some("StringFamilyInhabitanceRow".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "language".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "target_type".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "type_realization".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "ownership".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "lifetime".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "growability".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "encoding".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: 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", 8684, 8923),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(988),
+            name: Some("TypeInstantiationRealization".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "language".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "target".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "carrier".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "cost".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/cross_target_coverage.dag", 6364, 12528),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 8925, 9044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(977),
-            name: Some("CompilerDiagnosticKind".to_string()),
+            id: DeclarationId(989),
+            name: Some("CallableStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "TokenizerError".to_string(),
-                        ty: DeclarationId(2272),
-                    },
-                    Field {
-                        label: "ParseError".to_string(),
+                        label: "ListEmpty".to_string(),
                         ty: DeclarationId(2273),
                     },
                     Field {
-                        label: "TypeMismatch".to_string(),
+                        label: "ListSingleton".to_string(),
                         ty: DeclarationId(2274),
                     },
                     Field {
-                        label: "ArityMismatch".to_string(),
+                        label: "ListCons".to_string(),
                         ty: DeclarationId(2275),
                     },
                     Field {
-                        label: "ResolveError".to_string(),
+                        label: "ListConcat".to_string(),
                         ty: DeclarationId(2276),
                     },
                     Field {
-                        label: "UnitMismatch".to_string(),
+                        label: "ListLength".to_string(),
                         ty: DeclarationId(2277),
                     },
                     Field {
-                        label: "BranchConditionNotBool".to_string(),
+                        label: "ListIsEmpty".to_string(),
                         ty: DeclarationId(2278),
                     },
                     Field {
-                        label: "MagnitudeOutOfRange".to_string(),
+                        label: "ListFold".to_string(),
                         ty: DeclarationId(2279),
                     },
                     Field {
-                        label: "MalformedIntegerRangeFact".to_string(),
+                        label: "ListMap".to_string(),
                         ty: DeclarationId(2280),
                     },
                     Field {
-                        label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2281),
+                        label: "ListFilter".to_string(),
+                        ty: DeclarationId(2281),
+                    },
+                    Field {
+                        label: "ListContains".to_string(),
+                        ty: DeclarationId(2282),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: 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", 9449, 9618),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(990),
+            name: Some("PatternRealization".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "language".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "target".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "strategy".to_string(),
+                        ty: DeclarationId(991),
+                    },
+                    Field {
+                        label: "empty_variant".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "cons_variant".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "scrutinee".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "empty_pattern".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "cons_pattern".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "head_expr".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "tail_expr".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "cost".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/emit_model.dag", 11557, 11846),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(991),
+            name: Some("PatternStrategy".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "PlaceholderPatternStrategy".to_string(),
+                        ty: DeclarationId(2283),
+                    },
+                    Field {
+                        label: "VectorList".to_string(),
+                        ty: DeclarationId(2284),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: 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", 12286, 12352),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(992),
+            name: Some("StatementSyntax".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "let_binding".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "let_binding_inferred".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", 12354, 12431),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(993),
+            name: Some("ExpressionSyntax".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "field_access".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "function_call".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "closure".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", 12433, 12523),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(994),
+            name: Some("ForEachSyntax".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "prefix".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "separator".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", 12525, 12584),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(995),
+            name: Some("ControlFlowSyntax".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "if_else".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "match_arm".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "for_each_syntax".to_string(),
+                        ty: DeclarationId(994),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: 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", 12586, 12683),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(996),
+            name: Some("LiteralSyntax".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "true_keyword".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "false_keyword".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "string_delimiter".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", 12685, 12781),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(997),
+            name: Some("ModuleSyntax".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "path_separator".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", 12783, 12829),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(998),
+            name: Some("FunctionSyntax".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "definition".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "definition_exported".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "definition_void".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "param_with_type".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "param_separator".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", 12831, 12983),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(999),
+            name: Some("TypeApplicationSyntax".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "optional".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", 12985, 13034),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1000),
+            name: Some("TypeDefinitionSyntax".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "struct_def".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "struct_field".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "enum_def".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "enum_unit_variant".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "enum_data_variant".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", 13248, 13396),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1001),
+            name: Some("RecordDeriveTemplateBundle".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "struct_def_no_debug".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "enum_def_no_debug".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", 14057, 14150),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1002),
+            name: Some("PatternMatchSyntax".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "match_expr".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "match_arm".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "variant_pattern".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "variant_pattern_positional".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "variant_pattern_empty".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "field_binding".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "field_binding_separator".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "wildcard".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", 14854, 15094),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1003),
+            name: Some("CollectionOps".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "concat_contract".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "length_contract".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "is_empty_contract".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "fold_contract".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "filter_contract".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "flat_map_contract".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "any_contract".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "all_contract".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "map_contract".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "filter".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "contains".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "empty_list".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "list_literal".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "cons".to_string(),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -33103,23 +32789,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1067, 1306),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 15096, 16332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(978),
-            name: Some("Correction".to_string()),
+            id: DeclarationId(1004),
+            name: Some("ValueConstructionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "description".to_string(),
+                        label: "struct_literal".to_string(),
                         ty: DeclarationId(230),
                     },
                     Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
+                        label: "struct_field_init".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "new_source".to_string(),
+                        label: "struct_field_separator".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "variant_construction".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "variant_named_construction".to_string(),
                         ty: DeclarationId(230),
                     },
                 ],
@@ -33132,20 +32826,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1512, 1765),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 16334, 16520),
         });
         declarations.push(Declaration {
-            id: DeclarationId(979),
-            name: Some("DiagnosticKindDecl".to_string()),
+            id: DeclarationId(1005),
+            name: Some("RenderingModel".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
+                        label: "read".to_string(),
+                        ty: DeclarationId(1006),
                     },
                     Field {
-                        label: "payload".to_string(),
-                        ty: DeclarationId(778),
+                        label: "construct".to_string(),
+                        ty: DeclarationId(1007),
                     },
                 ],
             },
@@ -33157,16 +32851,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 2545, 2608),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 16522, 16597),
         });
         declarations.push(Declaration {
-            id: DeclarationId(980),
-            name: Some("LensInstanceKindWitness".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "kind_decl".to_string(),
-                    ty: DeclarationId(1316),
-                }],
+            id: DeclarationId(1006),
+            name: Some("ReadStrategy".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "Borrow".to_string(),
+                        ty: DeclarationId(2285),
+                    },
+                    Field {
+                        label: "PassByValue".to_string(),
+                        ty: DeclarationId(2286),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -33176,20 +32876,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 4810, 4870),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 17095, 17139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(981),
-            name: Some("AnyDiagnosticKind".to_string()),
+            id: DeclarationId(1007),
+            name: Some("ConstructStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "CompilerKind".to_string(),
-                        ty: DeclarationId(2282),
+                        label: "CopyOrClone".to_string(),
+                        ty: DeclarationId(2287),
                     },
                     Field {
-                        label: "LensInstanceKind".to_string(),
-                        ty: DeclarationId(2283),
+                        label: "PassByValue".to_string(),
+                        ty: DeclarationId(2288),
                     },
                 ],
             },
@@ -33201,73 +32901,60 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5479, 5588),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 17432, 17486),
         });
         declarations.push(Declaration {
-            id: DeclarationId(982),
-            name: Some("Diagnostic".to_string()),
+            id: DeclarationId(1008),
+            name: Some("LanguageSpec".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "kind".to_string(),
-                        ty: DeclarationId(981),
+                        label: "statements".to_string(),
+                        ty: DeclarationId(1330),
                     },
                     Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
+                        label: "expressions".to_string(),
+                        ty: DeclarationId(1330),
                     },
                     Field {
-                        label: "message".to_string(),
-                        ty: DeclarationId(230),
+                        label: "control_flow".to_string(),
+                        ty: DeclarationId(1330),
                     },
                     Field {
-                        label: "fixes".to_string(),
-                        ty: DeclarationId(2284),
+                        label: "literals".to_string(),
+                        ty: DeclarationId(1330),
                     },
-                ],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5957, 6065),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(983),
-            name: Some("EmissionDiagnostic".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
                     Field {
-                        label: "UnderRefined".to_string(),
-                        ty: DeclarationId(2285),
+                        label: "modules".to_string(),
+                        ty: DeclarationId(1330),
                     },
                     Field {
-                        label: "NoInhabitant".to_string(),
-                        ty: DeclarationId(2286),
+                        label: "functions".to_string(),
+                        ty: DeclarationId(1330),
                     },
                     Field {
-                        label: "ContradictoryUse".to_string(),
-                        ty: DeclarationId(2288),
+                        label: "type_applications".to_string(),
+                        ty: DeclarationId(1330),
                     },
                     Field {
-                        label: "OutOfR2Scope".to_string(),
-                        ty: DeclarationId(2289),
+                        label: "type_definitions".to_string(),
+                        ty: DeclarationId(1330),
                     },
                     Field {
-                        label: "LifetimeProgramExtractionPending".to_string(),
-                        ty: DeclarationId(2290),
+                        label: "record_derive_templates".to_string(),
+                        ty: DeclarationId(1330),
                     },
                     Field {
-                        label: "FoldNotImplemented".to_string(),
-                        ty: DeclarationId(2291),
+                        label: "patterns".to_string(),
+                        ty: DeclarationId(1330),
                     },
                     Field {
-                        label: "MissingEmissionPath".to_string(),
-                        ty: DeclarationId(2292),
+                        label: "collection_ops".to_string(),
+                        ty: DeclarationId(1330),
+                    },
+                    Field {
+                        label: "values".to_string(),
+                        ty: DeclarationId(1330),
                     },
                 ],
             },
@@ -33279,37 +32966,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 8699, 11469),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 17488, 18014),
         });
         declarations.push(Declaration {
-            id: DeclarationId(984),
-            name: Some("Witness".to_string()),
+            id: DeclarationId(1009),
+            name: Some("PlaceholderConvention".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "Inhabits".to_string(),
-                        ty: DeclarationId(2307),
+                        label: "IndexedArgs".to_string(),
+                        ty: DeclarationId(2289),
                     },
                     Field {
-                        label: "Violates".to_string(),
-                        ty: DeclarationId(2308),
+                        label: "NamedArg".to_string(),
+                        ty: DeclarationId(2290),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(985)],
-            phantom_params: 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", 1608, 1697),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(985),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -33318,20 +32991,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 1608, 1697),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 19388, 19443),
         });
         declarations.push(Declaration {
-            id: DeclarationId(986),
-            name: Some("OptionalDiagnostic".to_string()),
+            id: DeclarationId(1010),
+            name: Some("MethodEmitTemplate".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "NoDiagnostic".to_string(),
-                        ty: DeclarationId(2309),
+                        label: "SingleTemplate".to_string(),
+                        ty: DeclarationId(2291),
                     },
                     Field {
-                        label: "SomeDiagnostic".to_string(),
-                        ty: DeclarationId(2310),
+                        label: "HigherOrderTemplates".to_string(),
+                        ty: DeclarationId(2292),
                     },
                 ],
             },
@@ -33343,37 +33016,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 1851, 1932),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 20578, 20734),
         });
         declarations.push(Declaration {
-            id: DeclarationId(987),
-            name: Some("DimensionReport".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
+            id: DeclarationId(1011),
+            name: Some("MethodTemplateContract".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
                     Field {
-                        label: "DimensionOk".to_string(),
-                        ty: DeclarationId(2313),
+                        label: "dag_method".to_string(),
+                        ty: DeclarationId(841),
                     },
                     Field {
-                        label: "DimensionFail".to_string(),
-                        ty: DeclarationId(2317),
+                        label: "runtime_template".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "emit_template".to_string(),
+                        ty: DeclarationId(1010),
+                    },
+                    Field {
+                        label: "wraps_result".to_string(),
+                        ty: DeclarationId(128),
+                    },
+                    Field {
+                        label: "placeholder_convention".to_string(),
+                        ty: DeclarationId(1009),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(988)],
-            phantom_params: 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", 2291, 2567),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(988),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -33382,45 +33053,51 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 2291, 2567),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 22527, 22714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(989),
-            name: Some("AnalysisDimension".to_string()),
+            id: DeclarationId(1012),
+            name: Some("CleanEmissionContract".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
+                        label: "expression_wrapping".to_string(),
+                        ty: DeclarationId(1014),
                     },
                     Field {
-                        label: "witness_of".to_string(),
-                        ty: DeclarationId(2319),
+                        label: "pattern_bindings".to_string(),
+                        ty: DeclarationId(1015),
                     },
                     Field {
-                        label: "compose".to_string(),
-                        ty: DeclarationId(2320),
+                        label: "variant_payload_field_access".to_string(),
+                        ty: DeclarationId(1016),
                     },
                     Field {
-                        label: "break_diagnostic".to_string(),
-                        ty: DeclarationId(2321),
+                        label: "imports".to_string(),
+                        ty: DeclarationId(1017),
+                    },
+                    Field {
+                        label: "block_return".to_string(),
+                        ty: DeclarationId(1018),
+                    },
+                    Field {
+                        label: "variable_bindings".to_string(),
+                        ty: DeclarationId(1019),
+                    },
+                    Field {
+                        label: "match_arm_body".to_string(),
+                        ty: DeclarationId(1020),
+                    },
+                    Field {
+                        label: "correction_style".to_string(),
+                        ty: DeclarationId(1021),
+                    },
+                    Field {
+                        label: "post_emit_verifier".to_string(),
+                        ty: DeclarationId(1022),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(990)],
-            phantom_params: 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", 3818, 4011),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(990),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -33429,34 +33106,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 3818, 4011),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 562, 944),
         });
         declarations.push(Declaration {
-            id: DeclarationId(991),
-            name: Some("Dimension".to_string()),
+            id: DeclarationId(1013),
+            name: Some("TargetCleanEmissionBinding".to_string()),
             connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "value".to_string(),
-                    ty: DeclarationId(993),
-                }],
+                children: vec![
+                    Field {
+                        label: "language".to_string(),
+                        ty: DeclarationId(1008),
+                    },
+                    Field {
+                        label: "clean_emission".to_string(),
+                        ty: DeclarationId(1012),
+                    },
+                ],
             },
-            type_params: vec![DeclarationId(992), DeclarationId(993)],
-            phantom_params: vec![PhantomParameter {
-                parameter: DeclarationId(992),
-                algebra: DeclarationId(2322),
-            }],
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(992),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -33465,12 +33131,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 1748, 1848),
         });
         declarations.push(Declaration {
-            id: DeclarationId(993),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
+            id: DeclarationId(1014),
+            name: Some("ExpressionWrappingRule".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "WrapEverything".to_string(),
+                        ty: DeclarationId(2293),
+                    },
+                    Field {
+                        label: "WrapOnlyInOperandPosition".to_string(),
+                        ty: DeclarationId(2294),
+                    },
+                    Field {
+                        label: "NoWrapping".to_string(),
+                        ty: DeclarationId(2295),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -33479,12 +33160,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 2192, 2283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(994),
-            name: Some("Meters".to_string()),
-            connective: TypeConnective::Conj { children: vec![] },
+            id: DeclarationId(1015),
+            name: Some("PatternBindingRule".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "EmitBindingAlways".to_string(),
+                        ty: DeclarationId(2296),
+                    },
+                    Field {
+                        label: "EmitUnderscoreWhenUnused".to_string(),
+                        ty: DeclarationId(2297),
+                    },
+                    Field {
+                        label: "EmitPrefixedUnderscoreWhenUnused".to_string(),
+                        ty: DeclarationId(2298),
+                    },
+                    Field {
+                        label: "NotApplicablePatternBinding".to_string(),
+                        ty: DeclarationId(2299),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -33493,12 +33193,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4704, 4715),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 2520, 2663),
         });
         declarations.push(Declaration {
-            id: DeclarationId(995),
-            name: Some("Seconds".to_string()),
-            connective: TypeConnective::Conj { children: vec![] },
+            id: DeclarationId(1016),
+            name: Some("VariantPayloadFieldAccessRule".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "AccessFromPayloadBinding".to_string(),
+                        ty: DeclarationId(2300),
+                    },
+                    Field {
+                        label: "OverrideNamedFieldsAtBindingSite".to_string(),
+                        ty: DeclarationId(2301),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -33507,12 +33218,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4716, 4728),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3330, 3430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(996),
-            name: Some("Kilograms".to_string()),
-            connective: TypeConnective::Conj { children: vec![] },
+            id: DeclarationId(1017),
+            name: Some("ImportRule".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "ImportEverythingDeclared".to_string(),
+                        ty: DeclarationId(2302),
+                    },
+                    Field {
+                        label: "IncludeOnlyReferenced".to_string(),
+                        ty: DeclarationId(2303),
+                    },
+                    Field {
+                        label: "ImportPerUsageSite".to_string(),
+                        ty: DeclarationId(2304),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -33521,12 +33247,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4729, 4743),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3544, 3637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(997),
-            name: Some("Amperes".to_string()),
-            connective: TypeConnective::Conj { children: vec![] },
+            id: DeclarationId(1018),
+            name: Some("BlockReturnRule".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "WrapReturnValue".to_string(),
+                        ty: DeclarationId(2305),
+                    },
+                    Field {
+                        label: "NoWrappingOnTerminalExpression".to_string(),
+                        ty: DeclarationId(2306),
+                    },
+                    Field {
+                        label: "ExplicitReturnKeyword".to_string(),
+                        ty: DeclarationId(2307),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -33535,12 +33276,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4744, 4756),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3756, 3857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(998),
-            name: Some("Kelvin".to_string()),
-            connective: TypeConnective::Conj { children: vec![] },
+            id: DeclarationId(1019),
+            name: Some("VariableBindingRule".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "EmitLetBindingAlways".to_string(),
+                        ty: DeclarationId(2308),
+                    },
+                    Field {
+                        label: "EmitLetUnderscoreWhenUnused".to_string(),
+                        ty: DeclarationId(2309),
+                    },
+                    Field {
+                        label: "OmitLetBinding".to_string(),
+                        ty: DeclarationId(2310),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -33549,12 +33305,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4757, 4768),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3995, 4095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(999),
-            name: Some("Moles".to_string()),
-            connective: TypeConnective::Conj { children: vec![] },
+            id: DeclarationId(1020),
+            name: Some("MatchArmBodyRule".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "WrapBody".to_string(),
+                        ty: DeclarationId(2311),
+                    },
+                    Field {
+                        label: "NoWrappingOnNonComplexBody".to_string(),
+                        ty: DeclarationId(2312),
+                    },
+                    Field {
+                        label: "NotApplicableMatchArmBody".to_string(),
+                        ty: DeclarationId(2313),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -33563,12 +33334,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4769, 4779),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 4328, 4423),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1000),
-            name: Some("Candela".to_string()),
-            connective: TypeConnective::Conj { children: vec![] },
+            id: DeclarationId(1021),
+            name: Some("CorrectionStyle".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "indent_unit".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "line_ending".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "string_quote".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "trailing_semicolon".to_string(),
+                        ty: DeclarationId(128),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -33577,34 +33367,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4780, 4792),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 4736, 4854),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1001),
-            name: Some("add_dimension".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![
-                    DeclarationId(2293),
-                    DeclarationId(2294),
-                    DeclarationId(2295),
+            id: DeclarationId(1022),
+            name: Some("PostEmitVerifier".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "command".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "args".to_string(),
+                        ty: DeclarationId(2314),
+                    },
+                    Field {
+                        label: "syntax_only".to_string(),
+                        ty: DeclarationId(128),
+                    },
+                    Field {
+                        label: "expected_exit_code".to_string(),
+                        ty: DeclarationId(93),
+                    },
+                    Field {
+                        label: "output_policy".to_string(),
+                        ty: DeclarationId(1023),
+                    },
                 ],
-                output: DeclarationId(2296),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4966, 4988)),
             },
-            type_params: vec![DeclarationId(1002), DeclarationId(1003)],
-            phantom_params: 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", 4794, 4988),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1002),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -33613,12 +33404,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4794, 4988),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 5270, 5418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1003),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
+            id: DeclarationId(1023),
+            name: Some("VerifierOutputPolicy".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "IgnoreVerifierOutput".to_string(),
+                        ty: DeclarationId(2315),
+                    },
+                    Field {
+                        label: "RequireEmptyStdout".to_string(),
+                        ty: DeclarationId(2316),
+                    },
+                    Field {
+                        label: "RequireEmptyStderr".to_string(),
+                        ty: DeclarationId(2317),
+                    },
+                    Field {
+                        label: "RequireEmptyStdoutAndStderr".to_string(),
+                        ty: DeclarationId(2318),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -33627,21 +33437,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4794, 4988),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 5663, 5791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1004),
-            name: Some("sub_dimension".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![
-                    DeclarationId(2297),
-                    DeclarationId(2298),
-                    DeclarationId(2299),
-                ],
-                output: DeclarationId(2300),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5162, 5184)),
+            id: DeclarationId(1024),
+            name: Some("ShapeATarget".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1008),
+                arguments: vec![],
             },
-            type_params: vec![DeclarationId(1005), DeclarationId(1006)],
+            type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -33649,62 +33454,102 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4990, 5184),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 2839, 2871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1005),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
+            id: DeclarationId(1025),
+            name: Some("rust_shape_a_target".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1024),
+                arguments: vec![],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Unparsed(SourceSpan::new(
+                "src/v3/std/cross_target_coverage.dag",
+                2914,
+                2927,
+            ))),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4990, 5184),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 2873, 2927),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1006),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
+            id: DeclarationId(1026),
+            name: Some("python_shape_a_target".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1024),
+                arguments: vec![],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Unparsed(SourceSpan::new(
+                "src/v3/std/cross_target_coverage.dag",
+                2971,
+                2986,
+            ))),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4990, 5184),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 2928, 2986),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1007),
-            name: Some("mul_dimension_scalar".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![
-                    DeclarationId(2301),
-                    DeclarationId(2302),
-                    DeclarationId(1009),
-                ],
-                output: DeclarationId(2303),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5350, 5379)),
+            id: DeclarationId(1027),
+            name: Some("go_shape_a_target".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1024),
+                arguments: vec![],
             },
-            type_params: vec![DeclarationId(1008), DeclarationId(1009)],
+            type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Unparsed(SourceSpan::new(
+                "src/v3/std/cross_target_coverage.dag",
+                3026,
+                3037,
+            ))),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 5186, 5379),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 2987, 3037),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1008),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
+            id: DeclarationId(1028),
+            name: Some("FormAxis".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "Atom".to_string(),
+                        ty: DeclarationId(2319),
+                    },
+                    Field {
+                        label: "Conj".to_string(),
+                        ty: DeclarationId(2320),
+                    },
+                    Field {
+                        label: "Disj".to_string(),
+                        ty: DeclarationId(2321),
+                    },
+                    Field {
+                        label: "Arrow".to_string(),
+                        ty: DeclarationId(2322),
+                    },
+                    Field {
+                        label: "Cardinality".to_string(),
+                        ty: DeclarationId(2323),
+                    },
+                    Field {
+                        label: "Instantiation".to_string(),
+                        ty: DeclarationId(2324),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -33713,12 +33558,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 5186, 5379),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3837, 3909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1009),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
+            id: DeclarationId(1029),
+            name: Some("BehaviorAxis".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "Value".to_string(),
+                        ty: DeclarationId(2325),
+                    },
+                    Field {
+                        label: "Transform".to_string(),
+                        ty: DeclarationId(2326),
+                    },
+                    Field {
+                        label: "Branch".to_string(),
+                        ty: DeclarationId(2327),
+                    },
+                    Field {
+                        label: "Loop".to_string(),
+                        ty: DeclarationId(2328),
+                    },
+                    Field {
+                        label: "Bind".to_string(),
+                        ty: DeclarationId(2329),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -33727,21 +33595,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 5186, 5379),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4469, 4529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1010),
-            name: Some("div_dimension_scalar".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![
-                    DeclarationId(2304),
-                    DeclarationId(2305),
-                    DeclarationId(1012),
+            id: DeclarationId(1030),
+            name: Some("MethodTemplateContractKey".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "target".to_string(),
+                        ty: DeclarationId(1024),
+                    },
+                    Field {
+                        label: "dag_method".to_string(),
+                        ty: DeclarationId(841),
+                    },
                 ],
-                output: DeclarationId(2306),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5545, 5574)),
             },
-            type_params: vec![DeclarationId(1011), DeclarationId(1012)],
+            type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -33749,12 +33620,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 5381, 5574),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4913, 4994),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1011),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
+            id: DeclarationId(1031),
+            name: Some("EmissionCell".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "connective".to_string(),
+                        ty: DeclarationId(1028),
+                    },
+                    Field {
+                        label: "behavior".to_string(),
+                        ty: DeclarationId(1029),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -33763,12 +33645,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 5381, 5574),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5427, 5496),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1012),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
+            id: DeclarationId(1032),
+            name: Some("EmissionPathProjection".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "row_identity".to_string(),
+                        ty: DeclarationId(1030),
+                    },
+                    Field {
+                        label: "cells".to_string(),
+                        ty: DeclarationId(2330),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -33777,173 +33670,1590 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 5381, 5574),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5842, 5943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1013),
-            name: Some("EmissionRule".to_string()),
+            id: DeclarationId(1033),
+            name: Some("emission_path_projections".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(230),
-                arguments: vec![],
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1032),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(2331)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::List(vec![
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1025)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(258)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1025)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(271)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1025)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(295)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1025)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(273)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1025)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(264)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1025)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(262)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1025)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(252)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1025)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(263)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1025)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(249)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1025)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(248)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1025)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(265)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1025)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(293)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1025)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(299)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(258)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(271)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(295)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(273)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(264)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(262)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(252)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(263)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(249)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(248)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(265)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(293)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(299)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(294)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(250)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(297)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1027)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(258)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1027)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(271)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1027)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(295)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1027)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(263)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1027)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(249)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1027)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(248)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1027)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(265)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1027)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(293)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1027)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(299)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1027)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(294)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1027)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(250)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1027)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(297)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2323),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2326),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+            ])),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emission_provenance.dag", 2797, 2823),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6364, 12528),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1014),
-            name: Some("OptionalSourceSpan".to_string()),
+            id: DeclarationId(1034),
+            name: Some("CompilerDiagnosticKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "NoSourceSpan".to_string(),
-                        ty: DeclarationId(2323),
-                    },
-                    Field {
-                        label: "SomeSourceSpan".to_string(),
-                        ty: DeclarationId(2324),
-                    },
-                ],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3681, 3762),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1015),
-            name: Some("EmissionProvenance".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "emitted_line".to_string(),
-                        ty: DeclarationId(98),
-                    },
-                    Field {
-                        label: "rule".to_string(),
-                        ty: DeclarationId(1013),
-                    },
-                    Field {
-                        label: "source_span".to_string(),
-                        ty: DeclarationId(1014),
-                    },
-                ],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emission_provenance.dag", 4898, 5008),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1016),
-            name: Some("TypeRealization".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "language".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "target".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "carrier".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "is_copy".to_string(),
-                        ty: DeclarationId(128),
-                    },
-                    Field {
-                        label: "fields".to_string(),
-                        ty: DeclarationId(2325),
+                        label: "TokenizerError".to_string(),
+                        ty: DeclarationId(2332),
                     },
                     Field {
-                        label: "cost".to_string(),
-                        ty: DeclarationId(93),
+                        label: "ParseError".to_string(),
+                        ty: DeclarationId(2333),
                     },
-                ],
-            },
-            type_params: vec![],
-            phantom_params: 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", 736, 887),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1017),
-            name: Some("TargetIntegerTypeInhabitance".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
                     Field {
-                        label: "language".to_string(),
-                        ty: DeclarationId(1316),
+                        label: "TypeMismatch".to_string(),
+                        ty: DeclarationId(2334),
                     },
                     Field {
-                        label: "kernel_integer".to_string(),
-                        ty: DeclarationId(1316),
+                        label: "ArityMismatch".to_string(),
+                        ty: DeclarationId(2335),
                     },
                     Field {
-                        label: "algebra".to_string(),
-                        ty: DeclarationId(1316),
+                        label: "ResolveError".to_string(),
+                        ty: DeclarationId(2336),
                     },
                     Field {
-                        label: "bound".to_string(),
-                        ty: DeclarationId(1018),
+                        label: "UnitMismatch".to_string(),
+                        ty: DeclarationId(2337),
                     },
                     Field {
-                        label: "type_realization".to_string(),
-                        ty: DeclarationId(1316),
+                        label: "BranchConditionNotBool".to_string(),
+                        ty: DeclarationId(2338),
                     },
-                ],
-            },
-            type_params: vec![],
-            phantom_params: 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", 2385, 2840),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1018),
-            name: Some("TargetIntegerInhabitanceBound".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
                     Field {
-                        label: "BoundUnspecified".to_string(),
-                        ty: DeclarationId(2326),
+                        label: "MagnitudeOutOfRange".to_string(),
+                        ty: DeclarationId(2339),
                     },
                     Field {
-                        label: "StaticBoundFact".to_string(),
-                        ty: DeclarationId(2327),
+                        label: "MalformedIntegerRangeFact".to_string(),
+                        ty: DeclarationId(2340),
                     },
                     Field {
-                        label: "PlatformDependentFact".to_string(),
-                        ty: DeclarationId(2328),
+                        label: "NominalOpacityViolation".to_string(),
+                        ty: DeclarationId(2341),
                     },
                 ],
             },
@@ -33955,87 +35265,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 4334, 4686),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1067, 1306),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1019),
-            name: Some("FieldBinding".to_string()),
+            id: DeclarationId(1035),
+            name: Some("Correction".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "dag_name".to_string(),
+                        label: "description".to_string(),
                         ty: DeclarationId(230),
                     },
                     Field {
-                        label: "access".to_string(),
-                        ty: DeclarationId(1020),
-                    },
-                    Field {
-                        label: "borrowed_read".to_string(),
-                        ty: DeclarationId(128),
-                    },
-                ],
-            },
-            type_params: vec![],
-            phantom_params: 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", 4688, 4772),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1020),
-            name: Some("FieldAccess".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "DirectField".to_string(),
-                        ty: DeclarationId(2329),
-                    },
-                    Field {
-                        label: "AccessorMethod".to_string(),
-                        ty: DeclarationId(2330),
-                    },
-                ],
-            },
-            type_params: vec![],
-            phantom_params: 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", 5155, 5222),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1021),
-            name: Some("OperatorRealization".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "language".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "target".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "op".to_string(),
-                        ty: DeclarationId(1316),
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
                     },
                     Field {
-                        label: "carrier".to_string(),
+                        label: "new_source".to_string(),
                         ty: DeclarationId(230),
                     },
-                    Field {
-                        label: "cost".to_string(),
-                        ty: DeclarationId(93),
-                    },
                 ],
             },
             type_params: vec![],
@@ -34046,65 +35294,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 5224, 5355),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1512, 1765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1022),
-            name: Some("BehaviorRealization".to_string()),
+            id: DeclarationId(1036),
+            name: Some("DiagnosticKindDecl".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "language".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "target".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "carrier".to_string(),
+                        label: "name".to_string(),
                         ty: DeclarationId(230),
                     },
                     Field {
-                        label: "cost".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/emit_model.dag", 5357, 5467),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1023),
-            name: Some("CallableRealization".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "language".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "target".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "strategy".to_string(),
-                        ty: DeclarationId(1032),
-                    },
-                    Field {
-                        label: "parameters".to_string(),
-                        ty: DeclarationId(2331),
-                    },
-                    Field {
-                        label: "cost".to_string(),
-                        ty: DeclarationId(93),
+                        label: "payload".to_string(),
+                        ty: DeclarationId(778),
                     },
                 ],
             },
@@ -34116,97 +35319,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 5469, 5628),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 2545, 2608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1024),
-            name: Some("CallableParameter".to_string()),
+            id: DeclarationId(1037),
+            name: Some("LensInstanceKindWitness".to_string()),
             connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "slot".to_string(),
-                        ty: DeclarationId(93),
-                    },
-                    Field {
-                        label: "disposition".to_string(),
-                        ty: DeclarationId(1025),
-                    },
-                ],
-            },
-            type_params: vec![],
-            phantom_params: 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", 6050, 6124),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1025),
-            name: Some("ParameterDisposition".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Borrowed".to_string(),
-                        ty: DeclarationId(2332),
-                    },
-                    Field {
-                        label: "Consumed".to_string(),
-                        ty: DeclarationId(2333),
-                    },
-                ],
-            },
-            type_params: vec![],
-            phantom_params: 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", 6581, 6632),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1026),
-            name: Some("StringOwnershipAxis".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Owned".to_string(),
-                        ty: DeclarationId(2334),
-                    },
-                    Field {
-                        label: "Borrowed".to_string(),
-                        ty: DeclarationId(2335),
-                    },
-                ],
-            },
-            type_params: vec![],
-            phantom_params: 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", 7044, 7091),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1027),
-            name: Some("StringLifetimeAxis".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "SelfContained".to_string(),
-                        ty: DeclarationId(2336),
-                    },
-                    Field {
-                        label: "Caller".to_string(),
-                        ty: DeclarationId(2337),
-                    },
-                ],
+                children: vec![Field {
+                    label: "kind_decl".to_string(),
+                    ty: DeclarationId(1330),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -34216,88 +35338,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 7399, 7451),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 4810, 4870),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1028),
-            name: Some("StringGrowabilityAxis".to_string()),
+            id: DeclarationId(1038),
+            name: Some("AnyDiagnosticKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "Growable".to_string(),
-                        ty: DeclarationId(2338),
-                    },
-                    Field {
-                        label: "Fixed".to_string(),
-                        ty: DeclarationId(2339),
-                    },
-                    Field {
-                        label: "NotApplicable".to_string(),
-                        ty: DeclarationId(2340),
-                    },
-                ],
-            },
-            type_params: vec![],
-            phantom_params: 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", 7678, 7745),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1029),
-            name: Some("StringEncodingAxis".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![Field {
-                    label: "Utf8FreeMonoidChar".to_string(),
-                    ty: DeclarationId(2341),
-                }],
-            },
-            type_params: vec![],
-            phantom_params: 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", 8054, 8100),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1030),
-            name: Some("StringFamilyInhabitanceRow".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "language".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "target_type".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "type_realization".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "ownership".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "lifetime".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "growability".to_string(),
-                        ty: DeclarationId(1316),
+                        label: "CompilerKind".to_string(),
+                        ty: DeclarationId(2342),
                     },
                     Field {
-                        label: "encoding".to_string(),
-                        ty: DeclarationId(1316),
+                        label: "LensInstanceKind".to_string(),
+                        ty: DeclarationId(2343),
                     },
                 ],
             },
@@ -34309,28 +35363,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 8684, 8923),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5479, 5588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1031),
-            name: Some("TypeInstantiationRealization".to_string()),
+            id: DeclarationId(1039),
+            name: Some("Diagnostic".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "language".to_string(),
-                        ty: DeclarationId(1316),
+                        label: "kind".to_string(),
+                        ty: DeclarationId(1038),
                     },
                     Field {
-                        label: "target".to_string(),
-                        ty: DeclarationId(1316),
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
                     },
                     Field {
-                        label: "carrier".to_string(),
+                        label: "message".to_string(),
                         ty: DeclarationId(230),
                     },
                     Field {
-                        label: "cost".to_string(),
-                        ty: DeclarationId(93),
+                        label: "fixes".to_string(),
+                        ty: DeclarationId(2344),
                     },
                 ],
             },
@@ -34342,53 +35396,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 8925, 9044),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5957, 6065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1032),
-            name: Some("CallableStrategy".to_string()),
+            id: DeclarationId(1040),
+            name: Some("EmissionDiagnostic".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "ListEmpty".to_string(),
-                        ty: DeclarationId(2342),
-                    },
-                    Field {
-                        label: "ListSingleton".to_string(),
-                        ty: DeclarationId(2343),
-                    },
-                    Field {
-                        label: "ListCons".to_string(),
-                        ty: DeclarationId(2344),
-                    },
-                    Field {
-                        label: "ListConcat".to_string(),
+                        label: "UnderRefined".to_string(),
                         ty: DeclarationId(2345),
                     },
                     Field {
-                        label: "ListLength".to_string(),
+                        label: "NoInhabitant".to_string(),
                         ty: DeclarationId(2346),
                     },
                     Field {
-                        label: "ListIsEmpty".to_string(),
-                        ty: DeclarationId(2347),
-                    },
-                    Field {
-                        label: "ListFold".to_string(),
+                        label: "ContradictoryUse".to_string(),
                         ty: DeclarationId(2348),
                     },
                     Field {
-                        label: "ListMap".to_string(),
+                        label: "OutOfR2Scope".to_string(),
                         ty: DeclarationId(2349),
                     },
                     Field {
-                        label: "ListFilter".to_string(),
+                        label: "LifetimeProgramExtractionPending".to_string(),
                         ty: DeclarationId(2350),
                     },
                     Field {
-                        label: "ListContains".to_string(),
+                        label: "FoldNotImplemented".to_string(),
                         ty: DeclarationId(2351),
                     },
+                    Field {
+                        label: "MissingEmissionPath".to_string(),
+                        ty: DeclarationId(2352),
+                    },
                 ],
             },
             type_params: vec![],
@@ -34399,59 +35441,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 9449, 9618),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 8699, 11469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1033),
-            name: Some("PatternRealization".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "language".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "target".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "strategy".to_string(),
-                        ty: DeclarationId(1034),
-                    },
-                    Field {
-                        label: "empty_variant".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "cons_variant".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "scrutinee".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "empty_pattern".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "cons_pattern".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "head_expr".to_string(),
-                        ty: DeclarationId(230),
-                    },
+            id: DeclarationId(1041),
+            name: Some("Witness".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "tail_expr".to_string(),
-                        ty: DeclarationId(230),
+                        label: "Inhabits".to_string(),
+                        ty: DeclarationId(2367),
                     },
                     Field {
-                        label: "cost".to_string(),
-                        ty: DeclarationId(93),
+                        label: "Violates".to_string(),
+                        ty: DeclarationId(2368),
                     },
                 ],
             },
+            type_params: vec![DeclarationId(1042)],
+            phantom_params: 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", 1608, 1697),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1042),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -34460,20 +35480,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 11557, 11846),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 1608, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1034),
-            name: Some("PatternStrategy".to_string()),
+            id: DeclarationId(1043),
+            name: Some("OptionalDiagnostic".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "PlaceholderPatternStrategy".to_string(),
-                        ty: DeclarationId(2352),
+                        label: "NoDiagnostic".to_string(),
+                        ty: DeclarationId(2369),
                     },
                     Field {
-                        label: "VectorList".to_string(),
-                        ty: DeclarationId(2353),
+                        label: "SomeDiagnostic".to_string(),
+                        ty: DeclarationId(2370),
                     },
                 ],
             },
@@ -34485,23 +35505,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 12286, 12352),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 1851, 1932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1035),
-            name: Some("StatementSyntax".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
+            id: DeclarationId(1044),
+            name: Some("DimensionReport".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "let_binding".to_string(),
-                        ty: DeclarationId(230),
+                        label: "DimensionOk".to_string(),
+                        ty: DeclarationId(2373),
                     },
                     Field {
-                        label: "let_binding_inferred".to_string(),
-                        ty: DeclarationId(230),
+                        label: "DimensionFail".to_string(),
+                        ty: DeclarationId(2377),
                     },
                 ],
             },
+            type_params: vec![DeclarationId(1045)],
+            phantom_params: 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", 2291, 2567),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1045),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -34510,28 +35544,32 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 12354, 12431),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 2291, 2567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1036),
-            name: Some("ExpressionSyntax".to_string()),
+            id: DeclarationId(1046),
+            name: Some("AnalysisDimension".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "field_access".to_string(),
+                        label: "name".to_string(),
                         ty: DeclarationId(230),
                     },
                     Field {
-                        label: "function_call".to_string(),
-                        ty: DeclarationId(230),
+                        label: "witness_of".to_string(),
+                        ty: DeclarationId(2379),
                     },
                     Field {
-                        label: "closure".to_string(),
-                        ty: DeclarationId(230),
+                        label: "compose".to_string(),
+                        ty: DeclarationId(2380),
+                    },
+                    Field {
+                        label: "break_diagnostic".to_string(),
+                        ty: DeclarationId(2381),
                     },
                 ],
             },
-            type_params: vec![],
+            type_params: vec![DeclarationId(1047)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -34539,23 +35577,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 12433, 12523),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 3818, 4011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1037),
-            name: Some("ForEachSyntax".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "prefix".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "separator".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                ],
-            },
+            id: DeclarationId(1047),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -34564,27 +35591,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 12525, 12584),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 3818, 4011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1038),
-            name: Some("ControlFlowSyntax".to_string()),
+            id: DeclarationId(1048),
+            name: Some("Dimension".to_string()),
             connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "if_else".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "match_arm".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "for_each_syntax".to_string(),
-                        ty: DeclarationId(1037),
-                    },
-                ],
+                children: vec![Field {
+                    label: "value".to_string(),
+                    ty: DeclarationId(1050),
+                }],
             },
+            type_params: vec![DeclarationId(1049), DeclarationId(1050)],
+            phantom_params: vec![PhantomParameter {
+                parameter: DeclarationId(1049),
+                algebra: DeclarationId(2382),
+            }],
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1049),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -34593,27 +35627,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 12586, 12683),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1039),
-            name: Some("LiteralSyntax".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "true_keyword".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "false_keyword".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "string_delimiter".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                ],
-            },
+            id: DeclarationId(1050),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -34622,17 +35641,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 12685, 12781),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1040),
-            name: Some("ModuleSyntax".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "path_separator".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            id: DeclarationId(1051),
+            name: Some("Meters".to_string()),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -34641,35 +35655,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 12783, 12829),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4704, 4715),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1041),
-            name: Some("FunctionSyntax".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "definition".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "definition_exported".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "definition_void".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "param_with_type".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "param_separator".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                ],
-            },
+            id: DeclarationId(1052),
+            name: Some("Seconds".to_string()),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -34678,17 +35669,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 12831, 12983),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4716, 4728),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1042),
-            name: Some("TypeApplicationSyntax".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "optional".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            id: DeclarationId(1053),
+            name: Some("Kilograms".to_string()),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -34697,35 +35683,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 12985, 13034),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4729, 4743),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1043),
-            name: Some("TypeDefinitionSyntax".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "struct_def".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "struct_field".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "enum_def".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "enum_unit_variant".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "enum_data_variant".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                ],
-            },
+            id: DeclarationId(1054),
+            name: Some("Amperes".to_string()),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -34734,23 +35697,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 13248, 13396),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4744, 4756),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1044),
-            name: Some("RecordDeriveTemplateBundle".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "struct_def_no_debug".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "enum_def_no_debug".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                ],
-            },
+            id: DeclarationId(1055),
+            name: Some("Kelvin".to_string()),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -34759,47 +35711,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 14057, 14150),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4757, 4768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1045),
-            name: Some("PatternMatchSyntax".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "match_expr".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "match_arm".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "variant_pattern".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "variant_pattern_positional".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "variant_pattern_empty".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "field_binding".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "field_binding_separator".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "wildcard".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                ],
-            },
+            id: DeclarationId(1056),
+            name: Some("Moles".to_string()),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -34808,71 +35725,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 14854, 15094),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4769, 4779),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1046),
-            name: Some("CollectionOps".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "concat_contract".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "length_contract".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "is_empty_contract".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "fold_contract".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "filter_contract".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "flat_map_contract".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "any_contract".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "all_contract".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "map_contract".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "filter".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "contains".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "empty_list".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "list_literal".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "cons".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                ],
-            },
+            id: DeclarationId(1057),
+            name: Some("Candela".to_string()),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -34881,35 +35739,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 15096, 16332),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4780, 4792),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1047),
-            name: Some("ValueConstructionSyntax".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "struct_literal".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "struct_field_init".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "struct_field_separator".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "variant_construction".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "variant_named_construction".to_string(),
-                        ty: DeclarationId(230),
-                    },
+            id: DeclarationId(1058),
+            name: Some("add_dimension".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![
+                    DeclarationId(2353),
+                    DeclarationId(2354),
+                    DeclarationId(2355),
                 ],
+                output: DeclarationId(2356),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4966, 4988)),
             },
+            type_params: vec![DeclarationId(1059), DeclarationId(1060)],
+            phantom_params: 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", 4794, 4988),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1059),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -34918,23 +35775,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 16334, 16520),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4794, 4988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1048),
-            name: Some("RenderingModel".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "read".to_string(),
-                        ty: DeclarationId(1049),
-                    },
-                    Field {
-                        label: "construct".to_string(),
-                        ty: DeclarationId(1050),
-                    },
-                ],
-            },
+            id: DeclarationId(1060),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -34943,24 +35789,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 16522, 16597),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4794, 4988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1049),
-            name: Some("ReadStrategy".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Borrow".to_string(),
-                        ty: DeclarationId(2354),
-                    },
-                    Field {
-                        label: "PassByValue".to_string(),
-                        ty: DeclarationId(2355),
-                    },
+            id: DeclarationId(1061),
+            name: Some("sub_dimension".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![
+                    DeclarationId(2357),
+                    DeclarationId(2358),
+                    DeclarationId(2359),
                 ],
+                output: DeclarationId(2360),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5162, 5184)),
             },
-            type_params: vec![],
+            type_params: vec![DeclarationId(1062), DeclarationId(1063)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -34968,23 +35811,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 17095, 17139),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4990, 5184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1050),
-            name: Some("ConstructStrategy".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "CopyOrClone".to_string(),
-                        ty: DeclarationId(2356),
-                    },
-                    Field {
-                        label: "PassByValue".to_string(),
-                        ty: DeclarationId(2357),
-                    },
-                ],
-            },
+            id: DeclarationId(1062),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -34993,63 +35825,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 17432, 17486),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4990, 5184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1051),
-            name: Some("LanguageSpec".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "statements".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "expressions".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "control_flow".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "literals".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "modules".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "functions".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "type_applications".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "type_definitions".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "record_derive_templates".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "patterns".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "collection_ops".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                    Field {
-                        label: "values".to_string(),
-                        ty: DeclarationId(1316),
-                    },
-                ],
-            },
+            id: DeclarationId(1063),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -35058,24 +35839,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 17488, 18014),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4990, 5184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1052),
-            name: Some("PlaceholderConvention".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "IndexedArgs".to_string(),
-                        ty: DeclarationId(2358),
-                    },
-                    Field {
-                        label: "NamedArg".to_string(),
-                        ty: DeclarationId(2359),
-                    },
+            id: DeclarationId(1064),
+            name: Some("mul_dimension_scalar".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![
+                    DeclarationId(2361),
+                    DeclarationId(2362),
+                    DeclarationId(1066),
                 ],
+                output: DeclarationId(2363),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5350, 5379)),
             },
-            type_params: vec![],
+            type_params: vec![DeclarationId(1065), DeclarationId(1066)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -35083,23 +35861,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 19388, 19443),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5186, 5379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1053),
-            name: Some("MethodEmitTemplate".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "SingleTemplate".to_string(),
-                        ty: DeclarationId(2360),
-                    },
-                    Field {
-                        label: "HigherOrderTemplates".to_string(),
-                        ty: DeclarationId(2361),
-                    },
-                ],
-            },
+            id: DeclarationId(1065),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -35108,35 +35875,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 20578, 20734),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5186, 5379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1054),
-            name: Some("MethodTemplateContract".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "dag_method".to_string(),
-                        ty: DeclarationId(841),
-                    },
-                    Field {
-                        label: "runtime_template".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "emit_template".to_string(),
-                        ty: DeclarationId(1053),
-                    },
-                    Field {
-                        label: "wraps_result".to_string(),
-                        ty: DeclarationId(128),
-                    },
-                    Field {
-                        label: "placeholder_convention".to_string(),
-                        ty: DeclarationId(1052),
-                    },
-                ],
-            },
+            id: DeclarationId(1066),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -35145,18 +35889,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 22527, 22714),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5186, 5379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1055),
-            name: Some("BootstrapFixture".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "virtual_path".to_string(),
-                    ty: DeclarationId(230),
-                }],
+            id: DeclarationId(1067),
+            name: Some("div_dimension_scalar".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![
+                    DeclarationId(2364),
+                    DeclarationId(2365),
+                    DeclarationId(1069),
+                ],
+                output: DeclarationId(2366),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5545, 5574)),
             },
-            type_params: vec![],
+            type_params: vec![DeclarationId(1068), DeclarationId(1069)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -35164,55 +35911,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1395, 1443),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5381, 5574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1056),
-            name: Some("BootstrapFixtureSet".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "rust_pilot_primitives".to_string(),
-                        ty: DeclarationId(1055),
-                    },
-                    Field {
-                        label: "rust_method_template_contracts".to_string(),
-                        ty: DeclarationId(1055),
-                    },
-                    Field {
-                        label: "python_method_template_contracts".to_string(),
-                        ty: DeclarationId(1055),
-                    },
-                    Field {
-                        label: "go_method_template_contracts".to_string(),
-                        ty: DeclarationId(1055),
-                    },
-                    Field {
-                        label: "anthropic_operations".to_string(),
-                        ty: DeclarationId(1055),
-                    },
-                    Field {
-                        label: "cross_target_coverage".to_string(),
-                        ty: DeclarationId(1055),
-                    },
-                    Field {
-                        label: "extdeps_cron".to_string(),
-                        ty: DeclarationId(1055),
-                    },
-                    Field {
-                        label: "extdeps_github_github".to_string(),
-                        ty: DeclarationId(1055),
-                    },
-                    Field {
-                        label: "extdeps_github_actions".to_string(),
-                        ty: DeclarationId(1055),
-                    },
-                    Field {
-                        label: "extdeps_github_ci".to_string(),
-                        ty: DeclarationId(1055),
-                    },
-                ],
-            },
+            id: DeclarationId(1068),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -35221,128 +35925,32 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1600, 2062),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5381, 5574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1057),
-            name: Some("bootstrap_fixture_authority".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1056),
-                arguments: vec![],
-            },
+            id: DeclarationId(1069),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1056)),
+            meta_tag: None,
             specialization_parent: None,
             inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "rust_pilot_primitives".to_string(),
-                        FieldValue::Record(vec![(
-                            "virtual_path".to_string(),
-                            FieldValue::Literal(LiteralBits::String(
-                                "dsl/extdeps/languages/rust/primitives.dag".to_string(),
-                            )),
-                        )]),
-                    ),
-                    (
-                        "rust_method_template_contracts".to_string(),
-                        FieldValue::Record(vec![(
-                            "virtual_path".to_string(),
-                            FieldValue::Literal(LiteralBits::String(
-                                "src/v3/std/rust_method_template_contracts.dag".to_string(),
-                            )),
-                        )]),
-                    ),
-                    (
-                        "python_method_template_contracts".to_string(),
-                        FieldValue::Record(vec![(
-                            "virtual_path".to_string(),
-                            FieldValue::Literal(LiteralBits::String(
-                                "src/v3/std/python_method_template_contracts.dag".to_string(),
-                            )),
-                        )]),
-                    ),
-                    (
-                        "go_method_template_contracts".to_string(),
-                        FieldValue::Record(vec![(
-                            "virtual_path".to_string(),
-                            FieldValue::Literal(LiteralBits::String(
-                                "src/v3/std/go_method_template_contracts.dag".to_string(),
-                            )),
-                        )]),
-                    ),
-                    (
-                        "anthropic_operations".to_string(),
-                        FieldValue::Record(vec![(
-                            "virtual_path".to_string(),
-                            FieldValue::Literal(LiteralBits::String(
-                                "src/v3/std/anthropic_operations.dag".to_string(),
-                            )),
-                        )]),
-                    ),
-                    (
-                        "cross_target_coverage".to_string(),
-                        FieldValue::Record(vec![(
-                            "virtual_path".to_string(),
-                            FieldValue::Literal(LiteralBits::String(
-                                "src/v3/std/cross_target_coverage.dag".to_string(),
-                            )),
-                        )]),
-                    ),
-                    (
-                        "extdeps_cron".to_string(),
-                        FieldValue::Record(vec![(
-                            "virtual_path".to_string(),
-                            FieldValue::Literal(LiteralBits::String(
-                                "dsl/extdeps/cron_schedule_model.dag".to_string(),
-                            )),
-                        )]),
-                    ),
-                    (
-                        "extdeps_github_github".to_string(),
-                        FieldValue::Record(vec![(
-                            "virtual_path".to_string(),
-                            FieldValue::Literal(LiteralBits::String(
-                                "dsl/extdeps/github/github.dag".to_string(),
-                            )),
-                        )]),
-                    ),
-                    (
-                        "extdeps_github_actions".to_string(),
-                        FieldValue::Record(vec![(
-                            "virtual_path".to_string(),
-                            FieldValue::Literal(LiteralBits::String(
-                                "dsl/extdeps/github/actions.dag".to_string(),
-                            )),
-                        )]),
-                    ),
-                    (
-                        "extdeps_github_ci".to_string(),
-                        FieldValue::Record(vec![(
-                            "virtual_path".to_string(),
-                            FieldValue::Literal(LiteralBits::String(
-                                "dsl/extdeps/github/ci.dag".to_string(),
-                            )),
-                        )]),
-                    ),
-                ],
-            }),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 2064, 3032),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5381, 5574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1058),
+            id: DeclarationId(1070),
             name: Some("go_language_spec_free_monoid_concat_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
+                template: DeclarationId(1011),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35363,7 +35971,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2360),
+                            constructor: DeclarationId(2291),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({left}, {right}...)".to_string(),
                             ))],
@@ -35376,7 +35984,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ),
@@ -35387,15 +35995,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 3213, 3515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1059),
+            id: DeclarationId(1071),
             name: Some("go_language_spec_free_monoid_length_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
+                template: DeclarationId(1011),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35414,7 +36022,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2360),
+                            constructor: DeclarationId(2291),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "int64(len({recv}))".to_string(),
                             ))],
@@ -35427,7 +36035,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ),
@@ -35438,15 +36046,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 3517, 3803),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1060),
+            id: DeclarationId(1072),
             name: Some("go_language_spec_free_monoid_emptiness_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
+                template: DeclarationId(1011),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35465,7 +36073,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2360),
+                            constructor: DeclarationId(2291),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv}) == 0".to_string(),
                             ))],
@@ -35478,7 +36086,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ),
@@ -35489,15 +36097,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 3895, 4182),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1061),
+            id: DeclarationId(1073),
             name: Some("go_language_spec_free_monoid_fold_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
+                template: DeclarationId(1011),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35518,7 +36126,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2360),
+                            constructor: DeclarationId(2291),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* fold({recv}, {init}, {body}) */".to_string(),
                             ))],
@@ -35531,7 +36139,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ),
@@ -35542,15 +36150,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 4617, 4931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1062),
+            id: DeclarationId(1074),
             name: Some("go_language_spec_map_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
+                template: DeclarationId(1011),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35571,7 +36179,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2360),
+                            constructor: DeclarationId(2291),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* map({recv}, {body}) */".to_string(),
                             ))],
@@ -35584,7 +36192,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ),
@@ -35595,15 +36203,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 5417, 5699),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1063),
+            id: DeclarationId(1075),
             name: Some("go_filter_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
+                template: DeclarationId(1011),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35624,7 +36232,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2360),
+                            constructor: DeclarationId(2291),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Filter({recv}, {arg})".to_string(),
                             ))],
@@ -35637,7 +36245,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ),
@@ -35648,15 +36256,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 5701, 5993),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1064),
+            id: DeclarationId(1076),
             name: Some("go_any_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
+                template: DeclarationId(1011),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35677,7 +36285,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2360),
+                            constructor: DeclarationId(2291),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Any({recv}, {arg})".to_string(),
                             ))],
@@ -35690,7 +36298,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ),
@@ -35701,15 +36309,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 5995, 6275),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1065),
+            id: DeclarationId(1077),
             name: Some("go_all_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
+                template: DeclarationId(1011),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35730,7 +36338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2360),
+                            constructor: DeclarationId(2291),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.All({recv}, {arg})".to_string(),
                             ))],
@@ -35743,7 +36351,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ),
@@ -35754,15 +36362,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6277, 6557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1066),
+            id: DeclarationId(1078),
             name: Some("go_flat_map_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
+                template: DeclarationId(1011),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35783,7 +36391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2360),
+                            constructor: DeclarationId(2291),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.FlatMap({recv}, {arg})".to_string(),
                             ))],
@@ -35796,7 +36404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ),
@@ -35807,18 +36415,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6559, 6857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1067),
+            id: DeclarationId(1079),
             name: Some("go_method_template_contracts".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1054),
+                    value: DeclarationId(1011),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2362)),
+            meta_tag: Some(DeclarationId(2383)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -35837,7 +36445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2360),
+                            constructor: DeclarationId(2291),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -35850,7 +36458,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ),
@@ -35872,7 +36480,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2360),
+                            constructor: DeclarationId(2291),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Join({recv}, {arg})".to_string(),
                             ))],
@@ -35885,7 +36493,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ),
@@ -35907,7 +36515,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2360),
+                            constructor: DeclarationId(2291),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Split({recv}, {arg})".to_string(),
                             ))],
@@ -35920,15 +36528,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ),
                 ]),
-                FieldValue::Reference(DeclarationId(1063)),
-                FieldValue::Reference(DeclarationId(1064)),
-                FieldValue::Reference(DeclarationId(1065)),
-                FieldValue::Reference(DeclarationId(1066)),
+                FieldValue::Reference(DeclarationId(1075)),
+                FieldValue::Reference(DeclarationId(1076)),
+                FieldValue::Reference(DeclarationId(1077)),
+                FieldValue::Reference(DeclarationId(1078)),
                 FieldValue::Record(vec![
                     (
                         "dag_method".to_string(),
@@ -35944,7 +36552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2360),
+                            constructor: DeclarationId(2291),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -35957,7 +36565,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ),
@@ -35977,7 +36585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2360),
+                            constructor: DeclarationId(2291),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -35990,7 +36598,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ),
@@ -36012,7 +36620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2360),
+                            constructor: DeclarationId(2291),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.SortBy({recv}, {arg})".to_string(),
                             ))],
@@ -36025,7 +36633,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ),
@@ -36047,7 +36655,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2360),
+                            constructor: DeclarationId(2291),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({recv}, {arg})".to_string(),
                             ))],
@@ -36060,7 +36668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ),
@@ -36082,7 +36690,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2360),
+                            constructor: DeclarationId(2291),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Contains({recv}, {arg})".to_string(),
                             ))],
@@ -36095,7 +36703,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ),
@@ -36106,183 +36714,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6859, 8941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1068),
-            name: Some("RecursionShape".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "DirectRecursion".to_string(),
-                        ty: DeclarationId(2376),
-                    },
-                    Field {
-                        label: "ListRecursion".to_string(),
-                        ty: DeclarationId(2377),
-                    },
-                    Field {
-                        label: "OptionalRecursion".to_string(),
-                        ty: DeclarationId(2378),
-                    },
-                    Field {
-                        label: "SetRecursion".to_string(),
-                        ty: DeclarationId(2379),
-                    },
-                    Field {
-                        label: "MapValueRecursion".to_string(),
-                        ty: DeclarationId(2380),
-                    },
-                ],
-            },
-            type_params: vec![],
-            phantom_params: 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", 5605, 5878),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1069),
-            name: Some("InductiveField".to_string()),
+            id: DeclarationId(1080),
+            name: Some("Lens".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "type_name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "variant_name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "field_name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "shape".to_string(),
-                        ty: DeclarationId(1068),
-                    },
-                    Field {
-                        label: "element_type".to_string(),
+                        label: "name".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/induction.dag", 7170, 7592),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1070),
-            name: Some("recursion_shape_eq".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1068), DeclarationId(1068)],
-                output: DeclarationId(128),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 7662, 8034)),
-            },
-            type_params: vec![],
-            phantom_params: 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", 7594, 8034),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1071),
-            name: Some("inductive_field_eq".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1069), DeclarationId(1069)],
-                output: DeclarationId(128),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8104, 8302)),
-            },
-            type_params: vec![],
-            phantom_params: 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", 8036, 8302),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1072),
-            name: Some("inductive_field_to_dimension".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1069), DeclarationId(230)],
-                output: DeclarationId(1220),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8768, 8799)),
-            },
-            type_params: vec![],
-            phantom_params: 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", 8678, 8799),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1073),
-            name: Some("SubValueRelation".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
                     Field {
-                        label: "StrictSubValue".to_string(),
-                        ty: DeclarationId(2381),
+                        label: "read".to_string(),
+                        ty: DeclarationId(2385),
                     },
                     Field {
-                        label: "IteratedSubValue".to_string(),
-                        ty: DeclarationId(2382),
+                        label: "sequential".to_string(),
+                        ty: DeclarationId(2386),
                     },
                     Field {
-                        label: "ArithmeticDescent".to_string(),
-                        ty: DeclarationId(2383),
+                        label: "branch".to_string(),
+                        ty: DeclarationId(2387),
                     },
                     Field {
-                        label: "PreservedValue".to_string(),
-                        ty: DeclarationId(2384),
+                        label: "iterate".to_string(),
+                        ty: DeclarationId(2388),
                     },
                     Field {
-                        label: "SubValueUnknown".to_string(),
-                        ty: DeclarationId(2385),
+                        label: "validate".to_string(),
+                        ty: DeclarationId(2389),
                     },
                 ],
             },
-            type_params: vec![],
-            phantom_params: 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", 9945, 10181),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1074),
-            name: Some("sub_value_to_evidence".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1073)],
-                output: DeclarationId(1213),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    11134,
-                    11737,
-                )),
-            },
-            type_params: vec![],
+            type_params: vec![DeclarationId(1081)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -36290,20 +36752,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 11062, 11737),
+            span: SourceSpan::new("src/v3/std/lens.dag", 4121, 4318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1075),
-            name: Some("shrink_factor_eq".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(938), DeclarationId(938)],
-                output: DeclarationId(128),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    12205,
-                    12691,
-                )),
-            },
+            id: DeclarationId(1081),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("C".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36312,19 +36766,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 12143, 12691),
+            span: SourceSpan::new("src/v3/std/lens.dag", 4121, 4318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1076),
-            name: Some("meet_sub_value".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1073), DeclarationId(1073)],
-                output: DeclarationId(1073),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    13282,
-                    14694,
-                )),
+            id: DeclarationId(1082),
+            name: Some("SectionRef".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "DeclarationScope".to_string(),
+                        ty: DeclarationId(2390),
+                    },
+                    Field {
+                        label: "NodeScope".to_string(),
+                        ty: DeclarationId(2391),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -36334,19 +36791,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 13202, 14694),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 3544, 3677),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1077),
-            name: Some("join_sub_value".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1073), DeclarationId(1073)],
-                output: DeclarationId(1073),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    15026,
-                    16329,
-                )),
+            id: DeclarationId(1083),
+            name: Some("DiagnosticSeverity".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![Field {
+                    label: "Error".to_string(),
+                    ty: DeclarationId(2392),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -36356,21 +36810,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 14946, 16329),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 4530, 4561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1078),
-            name: Some("compose_sub_value".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1073), DeclarationId(1069)],
-                output: DeclarationId(1073),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    17472,
-                    17594,
-                )),
+            id: DeclarationId(1084),
+            name: Some("LensEnforcement".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "project".to_string(),
+                        ty: DeclarationId(2393),
+                    },
+                    Field {
+                        label: "violates".to_string(),
+                        ty: DeclarationId(2394),
+                    },
+                ],
             },
-            type_params: vec![],
+            type_params: vec![
+                DeclarationId(1085),
+                DeclarationId(1086),
+                DeclarationId(1087),
+            ],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -36378,20 +36839,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 17384, 17594),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 5737, 5862),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1079),
-            name: Some("compose_sub_value_relations".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1073), DeclarationId(1073)],
-                output: DeclarationId(1073),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    18450,
-                    19796,
-                )),
-            },
+            id: DeclarationId(1085),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36400,20 +36853,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 18342, 19796),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 5737, 5862),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1080),
-            name: Some("sub_value_to_call_pattern".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1073)],
-                output: DeclarationId(2363),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    20571,
-                    21367,
-                )),
-            },
+            id: DeclarationId(1086),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Budget".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36422,20 +36867,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 20498, 21367),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 5737, 5862),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1081),
-            name: Some("sub_value_to_lowering_target".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1073)],
-                output: DeclarationId(2364),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    21959,
-                    22864,
-                )),
-            },
+            id: DeclarationId(1087),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Projected".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36444,31 +36881,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 21880, 22864),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 5737, 5862),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1082),
-            name: Some("PolynomialExponent".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "IntegerExpZero".to_string(),
-                        ty: DeclarationId(2386),
-                    },
-                    Field {
-                        label: "IntegerExpPos".to_string(),
-                        ty: DeclarationId(2387),
-                    },
+            id: DeclarationId(1088),
+            name: Some("EnforceableLens".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
                     Field {
-                        label: "FractionExp".to_string(),
-                        ty: DeclarationId(2388),
+                        label: "lens".to_string(),
+                        ty: DeclarationId(2395),
                     },
                     Field {
-                        label: "LogBasedExp".to_string(),
-                        ty: DeclarationId(2389),
+                        label: "enforcement".to_string(),
+                        ty: DeclarationId(2396),
                     },
                 ],
             },
+            type_params: vec![
+                DeclarationId(1089),
+                DeclarationId(1090),
+                DeclarationId(1091),
+            ],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 7813, 7943),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1089),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36477,20 +36924,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 24107, 24362),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 7813, 7943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1083),
-            name: Some("poly_exp_degree_one".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1082),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    24411,
-                    24450,
-                )),
-            },
+            id: DeclarationId(1090),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Budget".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36499,23 +36938,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 24364, 24450),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 7813, 7943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1084),
-            name: Some("AtomicCost".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "PolyCost".to_string(),
-                        ty: DeclarationId(2390),
-                    },
-                    Field {
-                        label: "LogCost".to_string(),
-                        ty: DeclarationId(2391),
-                    },
-                ],
-            },
+            id: DeclarationId(1091),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Projected".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36524,44 +36952,40 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 24962, 25079),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 7813, 7943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1085),
-            name: Some("CostBound".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "ConstantBound".to_string(),
-                        ty: DeclarationId(2392),
-                    },
-                    Field {
-                        label: "AtomicBound".to_string(),
-                        ty: DeclarationId(2393),
-                    },
+            id: DeclarationId(1092),
+            name: Some("EnforcedApplication".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
                     Field {
-                        label: "ProductBound".to_string(),
-                        ty: DeclarationId(2395),
+                        label: "enforceable_lens".to_string(),
+                        ty: DeclarationId(2397),
                     },
                     Field {
-                        label: "SumOfProductsBound".to_string(),
-                        ty: DeclarationId(2398),
+                        label: "section".to_string(),
+                        ty: DeclarationId(1082),
                     },
                     Field {
-                        label: "SumBound".to_string(),
-                        ty: DeclarationId(2400),
+                        label: "budget".to_string(),
+                        ty: DeclarationId(1094),
                     },
                     Field {
-                        label: "ForeverBound".to_string(),
-                        ty: DeclarationId(2401),
+                        label: "diagnostic_severity".to_string(),
+                        ty: DeclarationId(1083),
                     },
                     Field {
-                        label: "ErrorBound".to_string(),
-                        ty: DeclarationId(2402),
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
-            type_params: vec![],
+            type_params: vec![
+                DeclarationId(1093),
+                DeclarationId(1094),
+                DeclarationId(1095),
+            ],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -36569,20 +36993,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 26709, 27469),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 9637, 9855),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1086),
-            name: Some("sum_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2365)],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    27880,
-                    27986,
-                )),
-            },
+            id: DeclarationId(1093),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36591,20 +37007,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 27830, 27986),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 9637, 9855),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1087),
-            name: Some("cost_bound_is_sum_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1085)],
-                output: DeclarationId(128),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    28310,
-                    28563,
-                )),
-            },
+            id: DeclarationId(1094),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Budget".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36613,16 +37021,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 28261, 28563),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 9637, 9855),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1088),
-            name: Some("cost_bound_to_symbolic".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1085)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(544))),
-            },
+            id: DeclarationId(1095),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Projected".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36631,17 +37035,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 29000, 29517),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 9637, 9855),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1089),
-            name: Some("atomic_cost_to_symbolic".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1084)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(553))),
+            id: DeclarationId(1096),
+            name: Some("IntrospectApplication".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "lens".to_string(),
+                        ty: DeclarationId(2398),
+                    },
+                    Field {
+                        label: "section".to_string(),
+                        ty: DeclarationId(1082),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                ],
             },
-            type_params: vec![],
+            type_params: vec![DeclarationId(1097)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -36649,20 +37064,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 29519, 29839),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 10728, 10828),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1090),
-            name: Some("product_atoms_to_symbolic".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2366)],
-                output: DeclarationId(849),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    29913,
-                    29949,
-                )),
-            },
+            id: DeclarationId(1097),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36671,15 +37078,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 29841, 29949),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 10728, 10828),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1091),
-            name: Some("product_term_to_symbolic".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2367)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(555))),
+            id: DeclarationId(1098),
+            name: Some("DagDifference".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "detail".to_string(),
+                    ty: DeclarationId(230),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -36689,19 +37097,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 29951, 30060),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 684, 723),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1092),
-            name: Some("sum_products_to_symbolic".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2369)],
-                output: DeclarationId(849),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    30137,
-                    30172,
-                )),
+            id: DeclarationId(1099),
+            name: Some("SurfaceModule".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "items".to_string(),
+                    ty: DeclarationId(2399),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -36711,19 +37116,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 30062, 30172),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1149, 1198),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1093),
-            name: Some("cost_constant".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    30206,
-                    30223,
-                )),
+            id: DeclarationId(1100),
+            name: Some("SurfaceParam".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "name".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "ty".to_string(),
+                        ty: DeclarationId(1105),
+                    },
+                    Field {
+                        label: "refinement".to_string(),
+                        ty: DeclarationId(2400),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -36733,19 +37145,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 30174, 30223),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1200, 1281),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1094),
-            name: Some("cost_linear".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(230)],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    30267,
-                    30351,
-                )),
+            id: DeclarationId(1101),
+            name: Some("SurfaceField".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "name".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "ty".to_string(),
+                        ty: DeclarationId(1105),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -36755,19 +37170,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 30224, 30351),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1283, 1337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1095),
-            name: Some("cost_poly".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(230), DeclarationId(93)],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    30406,
-                    30805,
-                )),
+            id: DeclarationId(1102),
+            name: Some("SurfaceVariant".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "name".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "payload".to_string(),
+                        ty: DeclarationId(1103),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -36777,19 +37199,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 30352, 30805),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1339, 1422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1096),
-            name: Some("cost_root".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(230), DeclarationId(93)],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    30855,
-                    31129,
-                )),
+            id: DeclarationId(1103),
+            name: Some("VariantPayload".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "Positional".to_string(),
+                        ty: DeclarationId(2402),
+                    },
+                    Field {
+                        label: "Record".to_string(),
+                        ty: DeclarationId(2404),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -36799,19 +37224,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 30806, 31129),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1712, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1097),
-            name: Some("cost_sqrt".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(230)],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    31171,
-                    31204,
-                )),
+            id: DeclarationId(1104),
+            name: Some("TypeAngleArg".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "TypeExpr".to_string(),
+                        ty: DeclarationId(2405),
+                    },
+                    Field {
+                        label: "WidthNatLiteral".to_string(),
+                        ty: DeclarationId(2406),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -36821,19 +37249,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 31130, 31204),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 2067, 2175),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1098),
-            name: Some("cost_cbrt".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(230)],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    31246,
-                    31279,
-                )),
+            id: DeclarationId(1105),
+            name: Some("SurfaceType".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "Named".to_string(),
+                        ty: DeclarationId(2407),
+                    },
+                    Field {
+                        label: "Parameterized".to_string(),
+                        ty: DeclarationId(2409),
+                    },
+                    Field {
+                        label: "Optional".to_string(),
+                        ty: DeclarationId(2410),
+                    },
+                    Field {
+                        label: "Arrow".to_string(),
+                        ty: DeclarationId(2412),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -36843,19 +37282,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 31205, 31279),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 2431, 2759),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1099),
-            name: Some("cost_log".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(230)],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    31320,
-                    31370,
-                )),
+            id: DeclarationId(1106),
+            name: Some("SurfaceRecordField".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "name".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "value".to_string(),
+                        ty: DeclarationId(1112),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -36865,19 +37311,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 31280, 31370),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 2761, 2843),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1100),
-            name: Some("cost_nlogn".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(230)],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    31414,
-                    31532,
-                )),
+            id: DeclarationId(1107),
+            name: Some("SurfaceMapEntry".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "key".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "key_span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                    Field {
+                        label: "value".to_string(),
+                        ty: DeclarationId(1112),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -36887,19 +37344,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 31372, 31532),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 3733, 3834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1101),
-            name: Some("cost_graph_linear".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(230), DeclarationId(230)],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    31602,
-                    31778,
-                )),
+            id: DeclarationId(1108),
+            name: Some("SurfaceMatchArm".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "pattern".to_string(),
+                        ty: DeclarationId(1110),
+                    },
+                    Field {
+                        label: "body".to_string(),
+                        ty: DeclarationId(1112),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -36909,28 +37373,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 31534, 31778),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 3836, 3925),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1102),
-            name: Some("RecurrenceForm".to_string()),
+            id: DeclarationId(1109),
+            name: Some("SurfacePatternField".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "param".to_string(),
+                        label: "name".to_string(),
                         ty: DeclarationId(230),
                     },
                     Field {
-                        label: "branches".to_string(),
-                        ty: DeclarationId(93),
-                    },
-                    Field {
-                        label: "divisor".to_string(),
-                        ty: DeclarationId(93),
+                        label: "binding".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "work_exponent".to_string(),
-                        ty: DeclarationId(93),
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -36942,19 +37402,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 32935, 33026),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 3927, 4007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1103),
-            name: Some("int_add_checked".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(2370),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    33617,
-                    33868,
-                )),
+            id: DeclarationId(1110),
+            name: Some("SurfacePattern".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "BareVariant".to_string(),
+                        ty: DeclarationId(2413),
+                    },
+                    Field {
+                        label: "VariantWith".to_string(),
+                        ty: DeclarationId(2414),
+                    },
+                    Field {
+                        label: "VariantFields".to_string(),
+                        ty: DeclarationId(2416),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -36964,19 +37431,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 33574, 33868),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 4105, 4371),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1104),
-            name: Some("int_mul_checked".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(2371),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    33913,
-                    34702,
-                )),
+            id: DeclarationId(1111),
+            name: Some("SurfaceLiteral".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "Int".to_string(),
+                        ty: DeclarationId(2417),
+                    },
+                    Field {
+                        label: "Bool".to_string(),
+                        ty: DeclarationId(2418),
+                    },
+                    Field {
+                        label: "String".to_string(),
+                        ty: DeclarationId(2419),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -36986,19 +37460,66 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 33870, 34702),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5019, 5088),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1105),
-            name: Some("bounded_int_pow_exponent".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(93)],
-                output: DeclarationId(2372),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    35162,
-                    35285,
-                )),
+            id: DeclarationId(1112),
+            name: Some("SurfaceExpr".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "Literal".to_string(),
+                        ty: DeclarationId(2420),
+                    },
+                    Field {
+                        label: "Var".to_string(),
+                        ty: DeclarationId(2421),
+                    },
+                    Field {
+                        label: "Path".to_string(),
+                        ty: DeclarationId(2424),
+                    },
+                    Field {
+                        label: "Call".to_string(),
+                        ty: DeclarationId(2426),
+                    },
+                    Field {
+                        label: "PathCall".to_string(),
+                        ty: DeclarationId(2430),
+                    },
+                    Field {
+                        label: "VariantRecord".to_string(),
+                        ty: DeclarationId(2432),
+                    },
+                    Field {
+                        label: "Operator".to_string(),
+                        ty: DeclarationId(2434),
+                    },
+                    Field {
+                        label: "Lambda".to_string(),
+                        ty: DeclarationId(2436),
+                    },
+                    Field {
+                        label: "If".to_string(),
+                        ty: DeclarationId(2437),
+                    },
+                    Field {
+                        label: "Match".to_string(),
+                        ty: DeclarationId(2439),
+                    },
+                    Field {
+                        label: "Record".to_string(),
+                        ty: DeclarationId(2441),
+                    },
+                    Field {
+                        label: "List".to_string(),
+                        ty: DeclarationId(2443),
+                    },
+                    Field {
+                        label: "Map".to_string(),
+                        ty: DeclarationId(2445),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -37008,19 +37529,54 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 35118, 35285),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5181, 9000),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1106),
-            name: Some("int_pow_bounded".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(2373),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    35637,
-                    36682,
-                )),
+            id: DeclarationId(1113),
+            name: Some("SurfaceItem".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "Let".to_string(),
+                        ty: DeclarationId(2447),
+                    },
+                    Field {
+                        label: "Fn".to_string(),
+                        ty: DeclarationId(2450),
+                    },
+                    Field {
+                        label: "FnExternalBody".to_string(),
+                        ty: DeclarationId(2453),
+                    },
+                    Field {
+                        label: "Data".to_string(),
+                        ty: DeclarationId(2455),
+                    },
+                    Field {
+                        label: "Module".to_string(),
+                        ty: DeclarationId(2457),
+                    },
+                    Field {
+                        label: "Import".to_string(),
+                        ty: DeclarationId(2460),
+                    },
+                    Field {
+                        label: "TypeAtom".to_string(),
+                        ty: DeclarationId(2462),
+                    },
+                    Field {
+                        label: "TypeRecord".to_string(),
+                        ty: DeclarationId(2465),
+                    },
+                    Field {
+                        label: "TypeSum".to_string(),
+                        ty: DeclarationId(2469),
+                    },
+                    Field {
+                        label: "TypeAlias".to_string(),
+                        ty: DeclarationId(2472),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -37030,249 +37586,964 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 35589, 36682),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9869, 11187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1107),
-            name: Some("ceil_log".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(2374),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    36900,
-                    37015,
-                )),
+            id: DeclarationId(1114),
+            name: Some("python_language_spec_free_monoid_concat_contract".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1011),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "dag_method".to_string(),
+                        FieldValue::Record(vec![(
+                            "decl".to_string(),
+                            FieldValue::Reference(DeclarationId(256)),
+                        )]),
+                    ),
+                    (
+                        "runtime_template".to_string(),
+                        FieldValue::Literal(LiteralBits::String("[*{left}, *{right}]".to_string())),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2291),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "[*{left}, *{right}]".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2290),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 36854, 37015),
+            span: SourceSpan::new(
+                "src/v3/std/python_method_template_contracts.dag",
+                3320,
+                3612,
+            ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1108),
-            name: Some("ceil_log_iter".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![
-                    DeclarationId(93),
-                    DeclarationId(93),
-                    DeclarationId(93),
-                    DeclarationId(93),
-                ],
-                output: DeclarationId(2375),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    37172,
-                    37534,
-                )),
+            id: DeclarationId(1115),
+            name: Some("python_language_spec_free_monoid_length_contract".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1011),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "dag_method".to_string(),
+                        FieldValue::Record(vec![(
+                            "decl".to_string(),
+                            FieldValue::Reference(DeclarationId(274)),
+                        )]),
+                    ),
+                    (
+                        "runtime_template".to_string(),
+                        FieldValue::Literal(LiteralBits::String("len({recv})".to_string())),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2291),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "len({recv})".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2290),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 37101, 37534),
+            span: SourceSpan::new(
+                "src/v3/std/python_method_template_contracts.dag",
+                3614,
+                3890,
+            ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1109),
-            name: Some("master_theorem".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1102)],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    37589,
-                    39626,
-                )),
+            id: DeclarationId(1116),
+            name: Some("python_language_spec_free_monoid_emptiness_contract".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1011),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "dag_method".to_string(),
+                        FieldValue::Record(vec![(
+                            "decl".to_string(),
+                            FieldValue::Reference(DeclarationId(270)),
+                        )]),
+                    ),
+                    (
+                        "runtime_template".to_string(),
+                        FieldValue::Literal(LiteralBits::String("(len({recv}) == 0)".to_string())),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2291),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "(len({recv}) == 0)".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2290),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 37536, 39626),
+            span: SourceSpan::new(
+                "src/v3/std/python_method_template_contracts.dag",
+                3997,
+                4292,
+            ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1110),
-            name: Some("catamorphism_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(230), DeclarationId(93)],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    39979,
-                    40137,
-                )),
+            id: DeclarationId(1117),
+            name: Some("python_language_spec_free_monoid_fold_contract".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1011),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "dag_method".to_string(),
+                        FieldValue::Record(vec![(
+                            "decl".to_string(),
+                            FieldValue::Reference(DeclarationId(266)),
+                        )]),
+                    ),
+                    (
+                        "runtime_template".to_string(),
+                        FieldValue::Literal(LiteralBits::String(
+                            "__v3_fold({recv}, {init}, {body})".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2291),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "__v3_fold({recv}, {init}, {body})".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2290),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 39909, 40137),
+            span: SourceSpan::new(
+                "src/v3/std/python_method_template_contracts.dag",
+                4665,
+                4981,
+            ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1111),
-            name: Some("derive_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![
-                    DeclarationId(230),
-                    DeclarationId(93),
-                    DeclarationId(938),
-                    DeclarationId(93),
-                ],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    40636,
-                    41660,
-                )),
+            id: DeclarationId(1118),
+            name: Some("python_language_spec_map_contract".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1011),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "dag_method".to_string(),
+                        FieldValue::Record(vec![(
+                            "decl".to_string(),
+                            FieldValue::Reference(DeclarationId(277)),
+                        )]),
+                    ),
+                    (
+                        "runtime_template".to_string(),
+                        FieldValue::Literal(LiteralBits::String(
+                            "[{body} for {item} in {recv}]".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2291),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "[{body} for {item} in {recv}]".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2290),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 40535, 41660),
+            span: SourceSpan::new(
+                "src/v3/std/python_method_template_contracts.dag",
+                5189,
+                5483,
+            ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1112),
-            name: Some("tree_traversal_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    41993,
-                    42050,
-                )),
+            id: DeclarationId(1119),
+            name: Some("python_filter_method_template_contract".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1011),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
-            value_body: 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(
+                            "[x for x in {recv} if {arg}(x)]".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2291),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "[x for x in {recv} if {arg}(x)]".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2290),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 41954, 42050),
+            span: SourceSpan::new(
+                "src/v3/std/python_method_template_contracts.dag",
+                5485,
+                5791,
+            ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1113),
-            name: Some("nested_iteration_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    42093,
-                    42151,
-                )),
+            id: DeclarationId(1120),
+            name: Some("python_any_method_template_contract".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1011),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
-            value_body: 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(
+                            "any({arg}(x) for x in {recv})".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2291),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "any({arg}(x) for x in {recv})".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2290),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 42052, 42151),
+            span: SourceSpan::new(
+                "src/v3/std/python_method_template_contracts.dag",
+                5793,
+                6089,
+            ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1114),
-            name: Some("linear_scan_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    42251,
-                    42306,
-                )),
+            id: DeclarationId(1121),
+            name: Some("python_all_method_template_contract".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1011),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
-            value_body: 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(
+                            "all({arg}(x) for x in {recv})".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2291),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "all({arg}(x) for x in {recv})".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2290),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 42215, 42306),
+            span: SourceSpan::new(
+                "src/v3/std/python_method_template_contracts.dag",
+                6091,
+                6387,
+            ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1115),
-            name: Some("binary_search_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    42503,
-                    42618,
-                )),
+            id: DeclarationId(1122),
+            name: Some("python_flat_map_method_template_contract".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1011),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
-            value_body: 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(
+                            "[y for x in {recv} for y in {arg}(x)]".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2291),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "[y for x in {recv} for y in {arg}(x)]".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2290),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 42465, 42618),
+            span: SourceSpan::new(
+                "src/v3/std/python_method_template_contracts.dag",
+                6389,
+                6711,
+            ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1116),
-            name: Some("mergesort_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    42698,
-                    42813,
-                )),
+            id: DeclarationId(1123),
+            name: Some("python_method_template_contracts".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1011),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(2473)),
             specialization_parent: None,
             inhabits: None,
-            value_body: 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("len({recv})".to_string())),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2291),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "len({recv})".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2290),
+                            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("{arg}.join({recv})".to_string())),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2291),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "{arg}.join({recv})".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2290),
+                            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})".to_string())),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2291),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "{recv}.split({arg})".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2290),
+                            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}[-1] if {recv} else None".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2291),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "{recv}[-1] if {recv} else None".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2290),
+                            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}[0] if {recv} else None".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2291),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "{recv}[0] if {recv} else None".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2290),
+                            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(
+                            "list(enumerate({recv}))".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2291),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "list(enumerate({recv}))".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2290),
+                            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(
+                            "[ord(c) for c in {recv}]".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2291),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "[ord(c) for c in {recv}]".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2290),
+                            payload: vec![],
+                        },
+                    ),
+                ]),
+                FieldValue::Reference(DeclarationId(1119)),
+                FieldValue::Reference(DeclarationId(1120)),
+                FieldValue::Reference(DeclarationId(1121)),
+                FieldValue::Reference(DeclarationId(1122)),
+                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}[{arg}:]".to_string())),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2291),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "{recv}[{arg}:]".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2290),
+                            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}[:{arg}]".to_string())),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2291),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "{recv}[:{arg}]".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2290),
+                            payload: vec![],
+                        },
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "dag_method".to_string(),
+                        FieldValue::Record(vec![(
+                            "decl".to_string(),
+                            FieldValue::Reference(DeclarationId(294)),
+                        )]),
+                    ),
+                    (
+                        "runtime_template".to_string(),
+                        FieldValue::Literal(LiteralBits::String(
+                            "sorted({recv}, key={arg})".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2291),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "sorted({recv}, key={arg})".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2290),
+                            payload: vec![],
+                        },
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "dag_method".to_string(),
+                        FieldValue::Record(vec![(
+                            "decl".to_string(),
+                            FieldValue::Reference(DeclarationId(250)),
+                        )]),
+                    ),
+                    (
+                        "runtime_template".to_string(),
+                        FieldValue::Literal(LiteralBits::String("{recv} + [{arg}]".to_string())),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2291),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "{recv} + [{arg}]".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2290),
+                            payload: vec![],
+                        },
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "dag_method".to_string(),
+                        FieldValue::Record(vec![(
+                            "decl".to_string(),
+                            FieldValue::Reference(DeclarationId(297)),
+                        )]),
+                    ),
+                    (
+                        "runtime_template".to_string(),
+                        FieldValue::Literal(LiteralBits::String("{arg} in {recv}".to_string())),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2291),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "{arg} in {recv}".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2290),
+                            payload: vec![],
+                        },
+                    ),
+                ]),
+            ])),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 42664, 42813),
+            span: SourceSpan::new(
+                "src/v3/std/python_method_template_contracts.dag",
+                6713,
+                9706,
+            ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1117),
-            name: Some("karatsuba_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    42980,
-                    43099,
-                )),
+            id: DeclarationId(1124),
+            name: Some("NamedField".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "label".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "value".to_string(),
+                        ty: DeclarationId(1125),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -37282,19 +38553,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 42946, 43099),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 760, 810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1118),
-            name: Some("strassen_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    43264,
-                    43378,
-                )),
+            id: DeclarationId(1125),
+            name: Some("Value".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "LiteralValue".to_string(),
+                        ty: DeclarationId(2475),
+                    },
+                    Field {
+                        label: "RecordValue".to_string(),
+                        ty: DeclarationId(2477),
+                    },
+                    Field {
+                        label: "VariantValue".to_string(),
+                        ty: DeclarationId(2478),
+                    },
+                    Field {
+                        label: "NodeRef".to_string(),
+                        ty: DeclarationId(2479),
+                    },
+                    Field {
+                        label: "CardinalityValue".to_string(),
+                        ty: DeclarationId(2480),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -37304,21 +38590,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 43231, 43378),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 2122, 2304),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1119),
-            name: Some("trial_division_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    43495,
-                    43520,
-                )),
+            id: DeclarationId(1126),
+            name: Some("ProgramObservation".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "observed".to_string(),
+                    ty: DeclarationId(1127),
+                }],
             },
-            type_params: vec![],
+            type_params: vec![DeclarationId(1127)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -37326,20 +38609,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 43456, 43520),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 3208, 3264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1120),
-            name: Some("cube_root_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    43555,
-                    43580,
-                )),
-            },
+            id: DeclarationId(1127),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -37348,19 +38623,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 43521, 43580),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 3208, 3264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1121),
-            name: Some("kth_root_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(93)],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    43662,
-                    43693,
-                )),
+            id: DeclarationId(1128),
+            name: Some("EvalFrame".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "bindings".to_string(),
+                    ty: DeclarationId(2481),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -37370,19 +38642,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 43623, 43693),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 3907, 3956),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1122),
-            name: Some("bfs_dfs_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    43929,
-                    43980,
-                )),
+            id: DeclarationId(1129),
+            name: Some("EvalStateStack".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "frames".to_string(),
+                    ty: DeclarationId(2482),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -37392,19 +38661,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 43897, 43980),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 4510, 4559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1123),
-            name: Some("dijkstra_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    44071,
-                    44353,
-                )),
+            id: DeclarationId(1130),
+            name: Some("EvalStateKey".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "state".to_string(),
+                    ty: DeclarationId(1129),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -37414,19 +38680,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 44038, 44353),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 4940, 4985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1124),
-            name: Some("bellman_ford_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    44456,
-                    44616,
-                )),
+            id: DeclarationId(1131),
+            name: Some("EvalStrategy".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![Field {
+                    label: "ApplicativeOrder".to_string(),
+                    ty: DeclarationId(2483),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -37436,19 +38699,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 44419, 44616),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 5368, 5442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1125),
-            name: Some("floyd_warshall_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    44723,
-                    44761,
-                )),
+            id: DeclarationId(1132),
+            name: Some("InputEvaluationOrder".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "LeftFirst".to_string(),
+                        ty: DeclarationId(2484),
+                    },
+                    Field {
+                        label: "RightFirst".to_string(),
+                        ty: DeclarationId(2485),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -37458,92 +38724,32 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 44684, 44761),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1126),
-            name: Some("signed_int_diagnostic_order".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1316),
-                }],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2403)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::List(vec![
-                FieldValue::Reference(DeclarationId(77)),
-                FieldValue::Reference(DeclarationId(78)),
-                FieldValue::Reference(DeclarationId(79)),
-                FieldValue::Reference(DeclarationId(80)),
-                FieldValue::Reference(DeclarationId(81)),
-            ])),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1200, 1304),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1127),
-            name: Some("unsigned_int_diagnostic_order".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1316),
-                }],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2404)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::List(vec![
-                FieldValue::Reference(DeclarationId(82)),
-                FieldValue::Reference(DeclarationId(83)),
-                FieldValue::Reference(DeclarationId(84)),
-                FieldValue::Reference(DeclarationId(85)),
-                FieldValue::Reference(DeclarationId(86)),
-            ])),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1378, 1489),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 5654, 5704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1128),
-            name: Some("Lens".to_string()),
+            id: DeclarationId(1133),
+            name: Some("EvalMemoKey".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "read".to_string(),
-                        ty: DeclarationId(2406),
-                    },
-                    Field {
-                        label: "sequential".to_string(),
-                        ty: DeclarationId(2407),
+                        label: "program".to_string(),
+                        ty: DeclarationId(723),
                     },
                     Field {
-                        label: "branch".to_string(),
-                        ty: DeclarationId(2408),
+                        label: "node".to_string(),
+                        ty: DeclarationId(721),
                     },
                     Field {
-                        label: "iterate".to_string(),
-                        ty: DeclarationId(2409),
+                        label: "state_key".to_string(),
+                        ty: DeclarationId(1130),
                     },
                     Field {
-                        label: "validate".to_string(),
-                        ty: DeclarationId(2410),
+                        label: "strategy".to_string(),
+                        ty: DeclarationId(1131),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(1129)],
+            type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -37551,12 +38757,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens.dag", 4121, 4318),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 6013, 6124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1129),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("C".to_string())),
+            id: DeclarationId(1134),
+            name: Some("evaluate".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(721), DeclarationId(2474)],
+                output: DeclarationId(1125),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/runtime.dag", 11265, 11284)),
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -37565,20 +38775,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens.dag", 4121, 4318),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 11196, 11284),
         });
+        declarations.push(Declaration { id: DeclarationId(1135), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1011), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1011)), 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(2292), 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(2290), 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(1136), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1011), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1011)), 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(2292), 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(2290), 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(1137), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1011), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1011)), 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(2292), 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(2290), 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(1138), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1011), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1011)), 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(2292), 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(2290), 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(1139), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(1011) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2486)), 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(2291), 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(2290), 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(2291), 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(2290), 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(2291), 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(2290), 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(2291), 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(2290), 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(2291), 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(2290), 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(2291), 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(2290), 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(2291), 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(2290), payload: vec![] })]), FieldValue::Reference(DeclarationId(1135)), FieldValue::Reference(DeclarationId(1136)), FieldValue::Reference(DeclarationId(1137)), FieldValue::Reference(DeclarationId(1138)), 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(2291), 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(2290), 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(2291), 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(2290), 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(1130),
-            name: Some("SectionRef".to_string()),
+            id: DeclarationId(1140),
+            name: Some("DescentEvidence".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "DeclarationScope".to_string(),
-                        ty: DeclarationId(2411),
+                        label: "Strict".to_string(),
+                        ty: DeclarationId(2495),
                     },
                     Field {
-                        label: "NodeScope".to_string(),
-                        ty: DeclarationId(2412),
+                        label: "NonIncreasing".to_string(),
+                        ty: DeclarationId(2496),
+                    },
+                    Field {
+                        label: "DescentUnknown".to_string(),
+                        ty: DeclarationId(2497),
                     },
                 ],
             },
@@ -37590,16 +38809,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 3285, 3418),
+            span: SourceSpan::new("src/v3/std/termination.dag", 742, 810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1131),
-            name: Some("DiagnosticSeverity".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![Field {
-                    label: "Error".to_string(),
-                    ty: DeclarationId(2413),
-                }],
+            id: DeclarationId(1141),
+            name: Some("evidence_rank".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1140)],
+                output: DeclarationId(93),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/termination.dag", 856, 938)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -37609,37 +38827,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 4271, 4302),
+            span: SourceSpan::new("src/v3/std/termination.dag", 812, 938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1132),
-            name: Some("LensEnforcement".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "project".to_string(),
-                        ty: DeclarationId(2414),
-                    },
-                    Field {
-                        label: "violates".to_string(),
-                        ty: DeclarationId(2415),
-                    },
-                ],
+            id: DeclarationId(1142),
+            name: Some("merge_evidence".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1140), DeclarationId(1140)],
+                output: DeclarationId(1140),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/termination.dag",
+                    1082,
+                    1410,
+                )),
             },
-            type_params: vec![DeclarationId(1133), DeclarationId(1134)],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 5251, 5362),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1133),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -37648,12 +38849,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 5251, 5362),
+            span: SourceSpan::new("src/v3/std/termination.dag", 1005, 1410),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1134),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Budget".to_string())),
+            id: DeclarationId(1143),
+            name: Some("join_evidence".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1140), DeclarationId(1140)],
+                output: DeclarationId(1140),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/termination.dag",
+                    1556,
+                    1755,
+                )),
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -37662,24 +38871,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 5251, 5362),
+            span: SourceSpan::new("src/v3/std/termination.dag", 1480, 1755),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1135),
-            name: Some("EnforceableLens".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "lens".to_string(),
-                        ty: DeclarationId(2416),
-                    },
-                    Field {
-                        label: "enforcement".to_string(),
-                        ty: DeclarationId(2417),
-                    },
-                ],
+            id: DeclarationId(1144),
+            name: Some("promote_to_strict".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1140)],
+                output: DeclarationId(1140),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/termination.dag",
+                    2217,
+                    2336,
+                )),
             },
-            type_params: vec![DeclarationId(1136), DeclarationId(1137)],
+            type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -37687,12 +38893,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 7313, 7421),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2150, 2336),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1136),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())),
+            id: DeclarationId(1145),
+            name: Some("optional_evidence_meet".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(2487), DeclarationId(2488)],
+                output: DeclarationId(2489),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/termination.dag",
+                    2488,
+                    2664,
+                )),
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -37701,12 +38915,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 7313, 7421),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2400, 2664),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1137),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Budget".to_string())),
+            id: DeclarationId(1146),
+            name: Some("map_evidence_merge_at".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(2490), DeclarationId(230), DeclarationId(1140)],
+                output: DeclarationId(2491),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/termination.dag",
+                    2833,
+                    3007,
+                )),
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -37715,63 +38937,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 7313, 7421),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2701, 3007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1138),
-            name: Some("EnforcedApplication".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
+            id: DeclarationId(1147),
+            name: Some("RankingDimension".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "enforceable_lens".to_string(),
-                        ty: DeclarationId(2418),
+                        label: "TreeSize".to_string(),
+                        ty: DeclarationId(2498),
                     },
                     Field {
-                        label: "section".to_string(),
-                        ty: DeclarationId(1130),
+                        label: "ListLength".to_string(),
+                        ty: DeclarationId(2499),
                     },
                     Field {
-                        label: "budget".to_string(),
-                        ty: DeclarationId(1140),
+                        label: "ArithmeticValue".to_string(),
+                        ty: DeclarationId(2500),
                     },
                     Field {
-                        label: "diagnostic_severity".to_string(),
-                        ty: DeclarationId(1131),
+                        label: "TokenPosition".to_string(),
+                        ty: DeclarationId(2501),
                     },
                     Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
+                        label: "SetCardinality".to_string(),
+                        ty: DeclarationId(2502),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(1139), DeclarationId(1140)],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 9030, 9226),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1139),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())),
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 9030, 9226),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1140),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Budget".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -37780,28 +38974,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 9030, 9226),
+            span: SourceSpan::new("src/v3/std/termination.dag", 3306, 3502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1141),
-            name: Some("IntrospectApplication".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "lens".to_string(),
-                        ty: DeclarationId(2419),
-                    },
+            id: DeclarationId(1148),
+            name: Some("PositiveDescentAmount".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "section".to_string(),
-                        ty: DeclarationId(1130),
+                        label: "OneStep".to_string(),
+                        ty: DeclarationId(2503),
                     },
                     Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
+                        label: "AdditionalStep".to_string(),
+                        ty: DeclarationId(2504),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(1142)],
+            type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -37809,12 +38999,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 10099, 10199),
+            span: SourceSpan::new("src/v3/std/termination.dag", 4478, 4571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1142),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())),
+            id: DeclarationId(1149),
+            name: Some("positive_descent_count".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1148)],
+                output: DeclarationId(93),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/termination.dag",
+                    4881,
+                    4989,
+                )),
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -37823,37 +39021,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 10099, 10199),
+            span: SourceSpan::new("src/v3/std/termination.dag", 4818, 4989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1143),
-            name: Some("Lookup".to_string()),
+            id: DeclarationId(1150),
+            name: Some("ProportionalDivisor".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "Miss".to_string(),
-                        ty: DeclarationId(2422),
+                        label: "DivideByTwo".to_string(),
+                        ty: DeclarationId(2505),
                     },
                     Field {
-                        label: "Hit".to_string(),
-                        ty: DeclarationId(2423),
+                        label: "StrictlyLarger".to_string(),
+                        ty: DeclarationId(2506),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(1144)],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lookup.dag", 4521, 4563),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1144),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("value".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -37862,15 +39046,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lookup.dag", 4521, 4563),
+            span: SourceSpan::new("src/v3/std/termination.dag", 5455, 5545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1145),
-            name: Some("miss_int_lookup".to_string()),
+            id: DeclarationId(1151),
+            name: Some("proportional_divisor_to_int".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(2420),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4601, 4611)),
+                inputs: vec![DeclarationId(1150)],
+                output: DeclarationId(93),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/termination.dag",
+                    5609,
+                    5722,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -37880,15 +39068,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lookup.dag", 4565, 4611),
+            span: SourceSpan::new("src/v3/std/termination.dag", 5547, 5722),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1146),
-            name: Some("hit_int_lookup".to_string()),
+            id: DeclarationId(1152),
+            name: Some("peano_literal_materialization_cap".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(93)],
-                output: DeclarationId(2421),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4654, 4666)),
+                inputs: vec![],
+                output: DeclarationId(93),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/termination.dag",
+                    5952,
+                    5959,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -37898,16 +39090,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lookup.dag", 4613, 4666),
+            span: SourceSpan::new("src/v3/std/termination.dag", 5906, 5959),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1147),
-            name: Some("DagDifference".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "detail".to_string(),
-                    ty: DeclarationId(230),
-                }],
+            id: DeclarationId(1153),
+            name: Some("positive_descent_amount_from_positive_int".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(93)],
+                output: DeclarationId(2492),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/termination.dag",
+                    6420,
+                    6780,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -37917,16 +39112,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 684, 723),
+            span: SourceSpan::new("src/v3/std/termination.dag", 6341, 6780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1148),
-            name: Some("SurfaceModule".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "items".to_string(),
-                    ty: DeclarationId(2424),
-                }],
+            id: DeclarationId(1154),
+            name: Some("proportional_divisor_from_int_at_least_two".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(93)],
+                output: DeclarationId(2493),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/termination.dag",
+                    6860,
+                    7221,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -37936,24 +39134,40 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1149, 1198),
+            span: SourceSpan::new("src/v3/std/termination.dag", 6782, 7221),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1149),
-            name: Some("SurfaceParam".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
+            id: DeclarationId(1155),
+            name: Some("DescentSource".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
+                        label: "ChildAccessor".to_string(),
+                        ty: DeclarationId(2507),
                     },
                     Field {
-                        label: "ty".to_string(),
-                        ty: DeclarationId(1154),
+                        label: "ListShrink".to_string(),
+                        ty: DeclarationId(2508),
                     },
                     Field {
-                        label: "refinement".to_string(),
-                        ty: DeclarationId(2425),
+                        label: "ArithmeticSubtractDescent".to_string(),
+                        ty: DeclarationId(2509),
+                    },
+                    Field {
+                        label: "ArithmeticDivideDescent".to_string(),
+                        ty: DeclarationId(2510),
+                    },
+                    Field {
+                        label: "ParserAdvance".to_string(),
+                        ty: DeclarationId(2511),
+                    },
+                    Field {
+                        label: "SetRemoval".to_string(),
+                        ty: DeclarationId(2512),
+                    },
+                    Field {
+                        label: "FoldIteration".to_string(),
+                        ty: DeclarationId(2513),
                     },
                 ],
             },
@@ -37965,22 +39179,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1200, 1281),
+            span: SourceSpan::new("src/v3/std/termination.dag", 7626, 7947),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1150),
-            name: Some("SurfaceField".to_string()),
+            id: DeclarationId(1156),
+            name: Some("TerminationProof".to_string()),
             connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "ty".to_string(),
-                        ty: DeclarationId(1154),
-                    },
-                ],
+                children: vec![Field {
+                    label: "dimensions".to_string(),
+                    ty: DeclarationId(2514),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -37990,24 +39198,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1283, 1337),
+            span: SourceSpan::new("src/v3/std/termination.dag", 7949, 8011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1151),
-            name: Some("SurfaceVariant".to_string()),
+            id: DeclarationId(1157),
+            name: Some("ProofEdge".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "name".to_string(),
+                        label: "caller".to_string(),
                         ty: DeclarationId(230),
                     },
                     Field {
-                        label: "payload".to_string(),
-                        ty: DeclarationId(1152),
+                        label: "callee".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
+                        label: "evidence".to_string(),
+                        ty: DeclarationId(2515),
                     },
                 ],
             },
@@ -38019,22 +39227,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1339, 1422),
+            span: SourceSpan::new("src/v3/std/termination.dag", 8156, 8242),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1152),
-            name: Some("VariantPayload".to_string()),
+            id: DeclarationId(1158),
+            name: Some("StrictEvidence".to_string()),
             connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Positional".to_string(),
-                        ty: DeclarationId(2427),
-                    },
-                    Field {
-                        label: "Record".to_string(),
-                        ty: DeclarationId(2429),
-                    },
-                ],
+                variants: vec![Field {
+                    label: "Strict".to_string(),
+                    ty: DeclarationId(2516),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -38044,20 +39246,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1712, 1796),
+            span: SourceSpan::new("src/v3/std/termination.dag", 8716, 8746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1153),
-            name: Some("TypeAngleArg".to_string()),
+            id: DeclarationId(1159),
+            name: Some("NonStrictEvidence".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "TypeExpr".to_string(),
-                        ty: DeclarationId(2430),
+                        label: "NonIncreasing".to_string(),
+                        ty: DeclarationId(2517),
                     },
                     Field {
-                        label: "WidthNatLiteral".to_string(),
-                        ty: DeclarationId(2431),
+                        label: "DescentUnknown".to_string(),
+                        ty: DeclarationId(2518),
                     },
                 ],
             },
@@ -38069,28 +39271,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 2067, 2175),
+            span: SourceSpan::new("src/v3/std/termination.dag", 9112, 9171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1154),
-            name: Some("SurfaceType".to_string()),
+            id: DeclarationId(1160),
+            name: Some("DescentResidual".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "Named".to_string(),
-                        ty: DeclarationId(2432),
-                    },
-                    Field {
-                        label: "Parameterized".to_string(),
-                        ty: DeclarationId(2434),
-                    },
-                    Field {
-                        label: "Optional".to_string(),
-                        ty: DeclarationId(2435),
+                        label: "EvidenceUnknown".to_string(),
+                        ty: DeclarationId(2519),
                     },
                     Field {
-                        label: "Arrow".to_string(),
-                        ty: DeclarationId(2437),
+                        label: "EvidenceIncomplete".to_string(),
+                        ty: DeclarationId(2520),
                     },
                 ],
             },
@@ -38102,24 +39296,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 2431, 2759),
+            span: SourceSpan::new("src/v3/std/termination.dag", 10238, 10320),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1155),
-            name: Some("SurfaceRecordField".to_string()),
+            id: DeclarationId(1161),
+            name: Some("DescentExecutionProof".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
+                        label: "cluster".to_string(),
+                        ty: DeclarationId(724),
                     },
                     Field {
-                        label: "value".to_string(),
-                        ty: DeclarationId(1161),
+                        label: "port".to_string(),
+                        ty: DeclarationId(722),
                     },
                     Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
+                        label: "per_path".to_string(),
+                        ty: DeclarationId(2521),
                     },
                 ],
             },
@@ -38131,30 +39325,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 2761, 2843),
+            span: SourceSpan::new("src/v3/std/termination.dag", 11157, 11263),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1156),
-            name: Some("SurfaceMapEntry".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "key".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "key_span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                    Field {
-                        label: "value".to_string(),
-                        ty: DeclarationId(1161),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
+            id: DeclarationId(1162),
+            name: Some("descent_execution_proof".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(724), DeclarationId(722)],
+                output: DeclarationId(2494),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/termination.dag",
+                    12400,
+                    12439,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -38164,53 +39347,32 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 3733, 3834),
+            span: SourceSpan::new("src/v3/std/termination.dag", 12279, 12439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1157),
-            name: Some("SurfaceMatchArm".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "pattern".to_string(),
-                        ty: DeclarationId(1159),
-                    },
+            id: DeclarationId(1163),
+            name: Some("RecursionShape".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "body".to_string(),
-                        ty: DeclarationId(1161),
+                        label: "DirectRecursion".to_string(),
+                        ty: DeclarationId(2535),
                     },
                     Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
+                        label: "ListRecursion".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("src/v3/std/parse_surface.dag", 3836, 3925),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1158),
-            name: Some("SurfacePatternField".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
                     Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
+                        label: "OptionalRecursion".to_string(),
+                        ty: DeclarationId(2537),
                     },
                     Field {
-                        label: "binding".to_string(),
-                        ty: DeclarationId(230),
+                        label: "SetRecursion".to_string(),
+                        ty: DeclarationId(2538),
                     },
                     Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
+                        label: "MapValueRecursion".to_string(),
+                        ty: DeclarationId(2539),
                     },
                 ],
             },
@@ -38222,53 +39384,32 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 3927, 4007),
+            span: SourceSpan::new("src/v3/std/induction.dag", 5605, 5878),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1159),
-            name: Some("SurfacePattern".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "BareVariant".to_string(),
-                        ty: DeclarationId(2438),
-                    },
+            id: DeclarationId(1164),
+            name: Some("InductiveField".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
                     Field {
-                        label: "VariantWith".to_string(),
-                        ty: DeclarationId(2439),
+                        label: "type_name".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "VariantFields".to_string(),
-                        ty: DeclarationId(2441),
+                        label: "variant_name".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/parse_surface.dag", 4105, 4371),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1160),
-            name: Some("SurfaceLiteral".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
                     Field {
-                        label: "Int".to_string(),
-                        ty: DeclarationId(2442),
+                        label: "field_name".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "Bool".to_string(),
-                        ty: DeclarationId(2443),
+                        label: "shape".to_string(),
+                        ty: DeclarationId(1163),
                     },
                     Field {
-                        label: "String".to_string(),
-                        ty: DeclarationId(2444),
+                        label: "element_type".to_string(),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -38280,66 +39421,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5019, 5088),
+            span: SourceSpan::new("src/v3/std/induction.dag", 7170, 7592),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1161),
-            name: Some("SurfaceExpr".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Literal".to_string(),
-                        ty: DeclarationId(2445),
-                    },
-                    Field {
-                        label: "Var".to_string(),
-                        ty: DeclarationId(2446),
-                    },
-                    Field {
-                        label: "Path".to_string(),
-                        ty: DeclarationId(2449),
-                    },
-                    Field {
-                        label: "Call".to_string(),
-                        ty: DeclarationId(2451),
-                    },
-                    Field {
-                        label: "PathCall".to_string(),
-                        ty: DeclarationId(2455),
-                    },
-                    Field {
-                        label: "VariantRecord".to_string(),
-                        ty: DeclarationId(2457),
-                    },
-                    Field {
-                        label: "Operator".to_string(),
-                        ty: DeclarationId(2459),
-                    },
-                    Field {
-                        label: "Lambda".to_string(),
-                        ty: DeclarationId(2461),
-                    },
-                    Field {
-                        label: "If".to_string(),
-                        ty: DeclarationId(2462),
-                    },
-                    Field {
-                        label: "Match".to_string(),
-                        ty: DeclarationId(2464),
-                    },
-                    Field {
-                        label: "Record".to_string(),
-                        ty: DeclarationId(2466),
-                    },
-                    Field {
-                        label: "List".to_string(),
-                        ty: DeclarationId(2468),
-                    },
-                    Field {
-                        label: "Map".to_string(),
-                        ty: DeclarationId(2470),
-                    },
-                ],
+            id: DeclarationId(1165),
+            name: Some("recursion_shape_eq".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1163), DeclarationId(1163)],
+                output: DeclarationId(128),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 7662, 8034)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -38349,52 +39439,68 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5181, 9000),
+            span: SourceSpan::new("src/v3/std/induction.dag", 7594, 8034),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1162),
-            name: Some("SurfaceItem".to_string()),
+            id: DeclarationId(1166),
+            name: Some("inductive_field_eq".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1164), DeclarationId(1164)],
+                output: DeclarationId(128),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8104, 8302)),
+            },
+            type_params: vec![],
+            phantom_params: 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", 8036, 8302),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1167),
+            name: Some("inductive_field_to_dimension".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1164), DeclarationId(230)],
+                output: DeclarationId(1147),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8768, 8799)),
+            },
+            type_params: vec![],
+            phantom_params: 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", 8678, 8799),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1168),
+            name: Some("SubValueRelation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "Let".to_string(),
-                        ty: DeclarationId(2472),
-                    },
-                    Field {
-                        label: "Fn".to_string(),
-                        ty: DeclarationId(2475),
-                    },
-                    Field {
-                        label: "FnExternalBody".to_string(),
-                        ty: DeclarationId(2478),
-                    },
-                    Field {
-                        label: "Data".to_string(),
-                        ty: DeclarationId(2480),
-                    },
-                    Field {
-                        label: "Module".to_string(),
-                        ty: DeclarationId(2482),
-                    },
-                    Field {
-                        label: "Import".to_string(),
-                        ty: DeclarationId(2485),
+                        label: "StrictSubValue".to_string(),
+                        ty: DeclarationId(2540),
                     },
                     Field {
-                        label: "TypeAtom".to_string(),
-                        ty: DeclarationId(2487),
+                        label: "IteratedSubValue".to_string(),
+                        ty: DeclarationId(2541),
                     },
                     Field {
-                        label: "TypeRecord".to_string(),
-                        ty: DeclarationId(2490),
+                        label: "ArithmeticDescent".to_string(),
+                        ty: DeclarationId(2542),
                     },
                     Field {
-                        label: "TypeSum".to_string(),
-                        ty: DeclarationId(2494),
+                        label: "PreservedValue".to_string(),
+                        ty: DeclarationId(2543),
                     },
                     Field {
-                        label: "TypeAlias".to_string(),
-                        ty: DeclarationId(2497),
+                        label: "SubValueUnknown".to_string(),
+                        ty: DeclarationId(2544),
                     },
                 ],
             },
@@ -38406,970 +39512,296 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9869, 11187),
+            span: SourceSpan::new("src/v3/std/induction.dag", 9945, 10181),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1163),
-            name: Some("python_language_spec_free_monoid_concat_contract".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
-                arguments: vec![],
+            id: DeclarationId(1169),
+            name: Some("sub_value_to_evidence".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1168)],
+                output: DeclarationId(1140),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    11134,
+                    11737,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: None,
             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(256)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String("[*{left}, *{right}]".to_string())),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2360),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "[*{left}, *{right}]".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2359),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new(
-                "src/v3/std/python_method_template_contracts.dag",
-                3320,
-                3612,
-            ),
+            span: SourceSpan::new("src/v3/std/induction.dag", 11062, 11737),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1164),
-            name: Some("python_language_spec_free_monoid_length_contract".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
-                arguments: vec![],
+            id: DeclarationId(1170),
+            name: Some("shrink_factor_eq".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(959), DeclarationId(959)],
+                output: DeclarationId(128),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    12205,
+                    12691,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: None,
             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(274)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String("len({recv})".to_string())),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2360),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "len({recv})".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2359),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new(
-                "src/v3/std/python_method_template_contracts.dag",
-                3614,
-                3890,
-            ),
+            span: SourceSpan::new("src/v3/std/induction.dag", 12143, 12691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1165),
-            name: Some("python_language_spec_free_monoid_emptiness_contract".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
-                arguments: vec![],
+            id: DeclarationId(1171),
+            name: Some("meet_sub_value".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1168), DeclarationId(1168)],
+                output: DeclarationId(1168),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    13282,
+                    14694,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: None,
             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(270)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String("(len({recv}) == 0)".to_string())),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2360),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "(len({recv}) == 0)".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2359),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new(
-                "src/v3/std/python_method_template_contracts.dag",
-                3997,
-                4292,
-            ),
+            span: SourceSpan::new("src/v3/std/induction.dag", 13202, 14694),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1166),
-            name: Some("python_language_spec_free_monoid_fold_contract".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
-                arguments: vec![],
+            id: DeclarationId(1172),
+            name: Some("join_sub_value".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1168), DeclarationId(1168)],
+                output: DeclarationId(1168),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    15026,
+                    16329,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: None,
             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(266)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String(
-                            "__v3_fold({recv}, {init}, {body})".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2360),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "__v3_fold({recv}, {init}, {body})".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2359),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new(
-                "src/v3/std/python_method_template_contracts.dag",
-                4665,
-                4981,
-            ),
+            span: SourceSpan::new("src/v3/std/induction.dag", 14946, 16329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1167),
-            name: Some("python_language_spec_map_contract".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
-                arguments: vec![],
+            id: DeclarationId(1173),
+            name: Some("compose_sub_value".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1168), DeclarationId(1164)],
+                output: DeclarationId(1168),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    17472,
+                    17594,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: None,
             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(277)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String(
-                            "[{body} for {item} in {recv}]".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2360),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "[{body} for {item} in {recv}]".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2359),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new(
-                "src/v3/std/python_method_template_contracts.dag",
-                5189,
-                5483,
-            ),
+            span: SourceSpan::new("src/v3/std/induction.dag", 17384, 17594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1168),
-            name: Some("python_filter_method_template_contract".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
-                arguments: vec![],
+            id: DeclarationId(1174),
+            name: Some("compose_sub_value_relations".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1168), DeclarationId(1168)],
+                output: DeclarationId(1168),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    18450,
+                    19796,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: None,
             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(
-                            "[x for x in {recv} if {arg}(x)]".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2360),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "[x for x in {recv} if {arg}(x)]".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2359),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new(
-                "src/v3/std/python_method_template_contracts.dag",
-                5485,
-                5791,
-            ),
+            span: SourceSpan::new("src/v3/std/induction.dag", 18342, 19796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1169),
-            name: Some("python_any_method_template_contract".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
-                arguments: vec![],
+            id: DeclarationId(1175),
+            name: Some("sub_value_to_call_pattern".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1168)],
+                output: DeclarationId(2522),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    20571,
+                    21367,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: None,
             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(
-                            "any({arg}(x) for x in {recv})".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2360),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "any({arg}(x) for x in {recv})".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2359),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new(
-                "src/v3/std/python_method_template_contracts.dag",
-                5793,
-                6089,
-            ),
+            span: SourceSpan::new("src/v3/std/induction.dag", 20498, 21367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1170),
-            name: Some("python_all_method_template_contract".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
-                arguments: vec![],
+            id: DeclarationId(1176),
+            name: Some("sub_value_to_lowering_target".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1168)],
+                output: DeclarationId(2523),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    21959,
+                    22864,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: None,
             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(
-                            "all({arg}(x) for x in {recv})".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2360),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "all({arg}(x) for x in {recv})".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2359),
-                            payload: vec![],
-                        },
-                    ),
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/induction.dag", 21880, 22864),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1177),
+            name: Some("PolynomialExponent".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "IntegerExpZero".to_string(),
+                        ty: DeclarationId(2545),
+                    },
+                    Field {
+                        label: "IntegerExpPos".to_string(),
+                        ty: DeclarationId(2546),
+                    },
+                    Field {
+                        label: "FractionExp".to_string(),
+                        ty: DeclarationId(2547),
+                    },
+                    Field {
+                        label: "LogBasedExp".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/python_method_template_contracts.dag",
-                6091,
-                6387,
-            ),
+            span: SourceSpan::new("src/v3/std/induction.dag", 24107, 24362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1171),
-            name: Some("python_flat_map_method_template_contract".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
-                arguments: vec![],
+            id: DeclarationId(1178),
+            name: Some("poly_exp_degree_one".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![],
+                output: DeclarationId(1177),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    24411,
+                    24450,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: None,
             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(
-                            "[y for x in {recv} for y in {arg}(x)]".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2360),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "[y for x in {recv} for y in {arg}(x)]".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2359),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new(
-                "src/v3/std/python_method_template_contracts.dag",
-                6389,
-                6711,
-            ),
+            span: SourceSpan::new("src/v3/std/induction.dag", 24364, 24450),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1172),
-            name: Some("python_method_template_contracts".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1054),
-                }],
+            id: DeclarationId(1179),
+            name: Some("AtomicCost".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "PolyCost".to_string(),
+                        ty: DeclarationId(2549),
+                    },
+                    Field {
+                        label: "LogCost".to_string(),
+                        ty: DeclarationId(2550),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2498)),
+            meta_tag: None,
             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("len({recv})".to_string())),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2360),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "len({recv})".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("{arg}.join({recv})".to_string())),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2360),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "{arg}.join({recv})".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})".to_string())),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2360),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "{recv}.split({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(273)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String(
-                            "{recv}[-1] if {recv} else None".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2360),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "{recv}[-1] if {recv} else None".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}[0] if {recv} else None".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2360),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "{recv}[0] if {recv} else None".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(
-                            "list(enumerate({recv}))".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2360),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "list(enumerate({recv}))".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(252)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String(
-                            "[ord(c) for c in {recv}]".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2360),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "[ord(c) for c in {recv}]".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2359),
-                            payload: vec![],
-                        },
-                    ),
-                ]),
-                FieldValue::Reference(DeclarationId(1168)),
-                FieldValue::Reference(DeclarationId(1169)),
-                FieldValue::Reference(DeclarationId(1170)),
-                FieldValue::Reference(DeclarationId(1171)),
-                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}[{arg}:]".to_string())),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2360),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "{recv}[{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(299)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String("{recv}[:{arg}]".to_string())),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2360),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "{recv}[:{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(294)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String(
-                            "sorted({recv}, key={arg})".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2360),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "sorted({recv}, key={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(250)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String("{recv} + [{arg}]".to_string())),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2360),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "{recv} + [{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(297)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String("{arg} in {recv}".to_string())),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2360),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "{arg} in {recv}".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2359),
-                            payload: vec![],
-                        },
-                    ),
-                ]),
-            ])),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new(
-                "src/v3/std/python_method_template_contracts.dag",
-                6713,
-                9706,
-            ),
+            span: SourceSpan::new("src/v3/std/induction.dag", 24962, 25079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1173),
-            name: Some("ResourceHandle".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
+            id: DeclarationId(1180),
+            name: Some("CostBound".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "type".to_string(),
-                        ty: DeclarationId(230),
+                        label: "ConstantBound".to_string(),
+                        ty: DeclarationId(2551),
                     },
                     Field {
-                        label: "resource_id".to_string(),
-                        ty: DeclarationId(230),
+                        label: "AtomicBound".to_string(),
+                        ty: DeclarationId(2552),
+                    },
+                    Field {
+                        label: "ProductBound".to_string(),
+                        ty: DeclarationId(2554),
+                    },
+                    Field {
+                        label: "SumOfProductsBound".to_string(),
+                        ty: DeclarationId(2557),
+                    },
+                    Field {
+                        label: "SumBound".to_string(),
+                        ty: DeclarationId(2559),
                     },
                     Field {
-                        label: "key".to_string(),
-                        ty: DeclarationId(230),
+                        label: "ForeverBound".to_string(),
+                        ty: DeclarationId(2560),
                     },
                     Field {
-                        label: "cap".to_string(),
-                        ty: DeclarationId(147),
+                        label: "ErrorBound".to_string(),
+                        ty: DeclarationId(2561),
                     },
                 ],
             },
@@ -39381,16 +39813,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/resources.dag", 739, 827),
+            span: SourceSpan::new("src/v3/std/induction.dag", 26709, 27469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1174),
-            name: Some("ResourceReference".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "target".to_string(),
-                    ty: DeclarationId(1316),
-                }],
+            id: DeclarationId(1181),
+            name: Some("sum_bound".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(2524)],
+                output: DeclarationId(1180),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    27880,
+                    27986,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39400,22 +39835,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/resources.dag", 829, 880),
+            span: SourceSpan::new("src/v3/std/induction.dag", 27830, 27986),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1175),
-            name: Some("NamedField".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "label".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "value".to_string(),
-                        ty: DeclarationId(1176),
-                    },
-                ],
+            id: DeclarationId(1182),
+            name: Some("cost_bound_is_sum_bound".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1180)],
+                output: DeclarationId(128),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    28310,
+                    28563,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39425,34 +39857,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 760, 810),
+            span: SourceSpan::new("src/v3/std/induction.dag", 28261, 28563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1176),
-            name: Some("Value".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "LiteralValue".to_string(),
-                        ty: DeclarationId(2500),
-                    },
-                    Field {
-                        label: "RecordValue".to_string(),
-                        ty: DeclarationId(2502),
-                    },
-                    Field {
-                        label: "VariantValue".to_string(),
-                        ty: DeclarationId(2503),
-                    },
-                    Field {
-                        label: "NodeRef".to_string(),
-                        ty: DeclarationId(2504),
-                    },
-                    Field {
-                        label: "CardinalityValue".to_string(),
-                        ty: DeclarationId(2505),
-                    },
-                ],
+            id: DeclarationId(1183),
+            name: Some("cost_bound_to_symbolic".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1180)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(544))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39462,18 +39875,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 2122, 2304),
+            span: SourceSpan::new("src/v3/std/induction.dag", 29000, 29517),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1177),
-            name: Some("ProgramObservation".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "observed".to_string(),
-                    ty: DeclarationId(1178),
-                }],
+            id: DeclarationId(1184),
+            name: Some("atomic_cost_to_symbolic".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1179)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(553))),
             },
-            type_params: vec![DeclarationId(1178)],
+            type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -39481,12 +39893,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 3208, 3264),
+            span: SourceSpan::new("src/v3/std/induction.dag", 29519, 29839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1178),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
+            id: DeclarationId(1185),
+            name: Some("product_atoms_to_symbolic".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(2525)],
+                output: DeclarationId(905),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    29913,
+                    29949,
+                )),
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -39495,16 +39915,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 3208, 3264),
+            span: SourceSpan::new("src/v3/std/induction.dag", 29841, 29949),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1179),
-            name: Some("EvalFrame".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "bindings".to_string(),
-                    ty: DeclarationId(2506),
-                }],
+            id: DeclarationId(1186),
+            name: Some("product_term_to_symbolic".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(2526)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(555))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39514,16 +39933,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 3907, 3956),
+            span: SourceSpan::new("src/v3/std/induction.dag", 29951, 30060),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1180),
-            name: Some("EvalStateStack".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "frames".to_string(),
-                    ty: DeclarationId(2507),
-                }],
+            id: DeclarationId(1187),
+            name: Some("sum_products_to_symbolic".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(2528)],
+                output: DeclarationId(905),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    30137,
+                    30172,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39533,16 +39955,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 4510, 4559),
+            span: SourceSpan::new("src/v3/std/induction.dag", 30062, 30172),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1181),
-            name: Some("EvalStateKey".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "state".to_string(),
-                    ty: DeclarationId(1180),
-                }],
+            id: DeclarationId(1188),
+            name: Some("cost_constant".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![],
+                output: DeclarationId(1180),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    30206,
+                    30223,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39552,16 +39977,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 4940, 4985),
+            span: SourceSpan::new("src/v3/std/induction.dag", 30174, 30223),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1182),
-            name: Some("EvalStrategy".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![Field {
-                    label: "ApplicativeOrder".to_string(),
-                    ty: DeclarationId(2508),
-                }],
+            id: DeclarationId(1189),
+            name: Some("cost_linear".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(1180),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    30267,
+                    30351,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39571,22 +39999,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 5368, 5442),
+            span: SourceSpan::new("src/v3/std/induction.dag", 30224, 30351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1183),
-            name: Some("InputEvaluationOrder".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "LeftFirst".to_string(),
-                        ty: DeclarationId(2509),
-                    },
-                    Field {
-                        label: "RightFirst".to_string(),
-                        ty: DeclarationId(2510),
-                    },
-                ],
+            id: DeclarationId(1190),
+            name: Some("cost_poly".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(230), DeclarationId(93)],
+                output: DeclarationId(1180),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    30406,
+                    30805,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39596,28 +40021,160 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 5654, 5704),
+            span: SourceSpan::new("src/v3/std/induction.dag", 30352, 30805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1184),
-            name: Some("EvalMemoKey".to_string()),
+            id: DeclarationId(1191),
+            name: Some("cost_root".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(230), DeclarationId(93)],
+                output: DeclarationId(1180),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    30855,
+                    31129,
+                )),
+            },
+            type_params: vec![],
+            phantom_params: 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", 30806, 31129),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1192),
+            name: Some("cost_sqrt".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(1180),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    31171,
+                    31204,
+                )),
+            },
+            type_params: vec![],
+            phantom_params: 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", 31130, 31204),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1193),
+            name: Some("cost_cbrt".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(1180),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    31246,
+                    31279,
+                )),
+            },
+            type_params: vec![],
+            phantom_params: 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", 31205, 31279),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1194),
+            name: Some("cost_log".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(1180),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    31320,
+                    31370,
+                )),
+            },
+            type_params: vec![],
+            phantom_params: 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", 31280, 31370),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1195),
+            name: Some("cost_nlogn".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(1180),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    31414,
+                    31532,
+                )),
+            },
+            type_params: vec![],
+            phantom_params: 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", 31372, 31532),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1196),
+            name: Some("cost_graph_linear".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(230), DeclarationId(230)],
+                output: DeclarationId(1180),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    31602,
+                    31778,
+                )),
+            },
+            type_params: vec![],
+            phantom_params: 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", 31534, 31778),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1197),
+            name: Some("RecurrenceForm".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "program".to_string(),
-                        ty: DeclarationId(723),
+                        label: "param".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "node".to_string(),
-                        ty: DeclarationId(721),
+                        label: "branches".to_string(),
+                        ty: DeclarationId(93),
                     },
                     Field {
-                        label: "state_key".to_string(),
-                        ty: DeclarationId(1181),
+                        label: "divisor".to_string(),
+                        ty: DeclarationId(93),
                     },
                     Field {
-                        label: "strategy".to_string(),
-                        ty: DeclarationId(1182),
+                        label: "work_exponent".to_string(),
+                        ty: DeclarationId(93),
                     },
                 ],
             },
@@ -39629,15 +40186,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 6013, 6124),
+            span: SourceSpan::new("src/v3/std/induction.dag", 32935, 33026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1185),
-            name: Some("evaluate".to_string()),
+            id: DeclarationId(1198),
+            name: Some("int_add_checked".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(721), DeclarationId(2499)],
-                output: DeclarationId(1176),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/runtime.dag", 11265, 11284)),
+                inputs: vec![DeclarationId(93), DeclarationId(93)],
+                output: DeclarationId(2529),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    33617,
+                    33868,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39647,17 +40208,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 11196, 11284),
+            span: SourceSpan::new("src/v3/std/induction.dag", 33574, 33868),
         });
-        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()),
-            connective: TypeConnective::Conj { children: vec![] },
+            id: DeclarationId(1199),
+            name: Some("int_mul_checked".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(93), DeclarationId(93)],
+                output: DeclarationId(2530),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    33913,
+                    34702,
+                )),
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -39666,22 +40230,19 @@ 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/induction.dag", 33870, 34702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1192),
-            name: Some("RestEndpointBinding".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "method".to_string(),
-                        ty: DeclarationId(198),
-                    },
-                    Field {
-                        label: "path".to_string(),
-                        ty: DeclarationId(730),
-                    },
-                ],
+            id: DeclarationId(1200),
+            name: Some("bounded_int_pow_exponent".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(93)],
+                output: DeclarationId(2531),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    35162,
+                    35285,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39691,16 +40252,19 @@ 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/induction.dag", 35118, 35285),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1193),
-            name: Some("CallableRef".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "decl".to_string(),
-                    ty: DeclarationId(1316),
-                }],
+            id: DeclarationId(1201),
+            name: Some("int_pow_bounded".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(93), DeclarationId(93)],
+                output: DeclarationId(2532),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    35637,
+                    36682,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39710,26 +40274,46 @@ 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/induction.dag", 35589, 36682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1194),
-            name: Some("Operation".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "callable".to_string(),
-                        ty: DeclarationId(1193),
-                    },
-                    Field {
-                        label: "inputs".to_string(),
-                        ty: DeclarationId(2512),
-                    },
-                    Field {
-                        label: "endpoint".to_string(),
-                        ty: DeclarationId(1192),
-                    },
+            id: DeclarationId(1202),
+            name: Some("ceil_log".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(93), DeclarationId(93)],
+                output: DeclarationId(2533),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    36900,
+                    37015,
+                )),
+            },
+            type_params: vec![],
+            phantom_params: 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", 36854, 37015),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1203),
+            name: Some("ceil_log_iter".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![
+                    DeclarationId(93),
+                    DeclarationId(93),
+                    DeclarationId(93),
+                    DeclarationId(93),
                 ],
+                output: DeclarationId(2534),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    37172,
+                    37534,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39739,36 +40323,41 @@ 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/induction.dag", 37101, 37534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1195),
-            name: Some("modeled_gunbc_ci_workflow".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1745),
-                arguments: vec![],
+            id: DeclarationId(1204),
+            name: Some("master_theorem".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1197)],
+                output: DeclarationId(1180),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    37589,
+                    39626,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1745)),
+            meta_tag: None,
             specialization_parent: None,
             inhabits: None,
-            value_body: Some(ValueBody::Unparsed(SourceSpan::new(
-                "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                1238,
-                2494,
-            ))),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 1195, 2494),
+            span: SourceSpan::new("src/v3/std/induction.dag", 37536, 39626),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1196),
-            name: Some("ci_demo_timing_read".to_string()),
+            id: DeclarationId(1205),
+            name: Some("catamorphism_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2513),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(597))),
+                inputs: vec![DeclarationId(230), DeclarationId(93)],
+                output: DeclarationId(1180),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    39979,
+                    40137,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39778,15 +40367,46 @@ 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", 3007, 4266),
+            span: SourceSpan::new("src/v3/std/induction.dag", 39909, 40137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1197),
-            name: Some("ci_wad_modeled_workflow_timing_witness".to_string()),
+            id: DeclarationId(1206),
+            name: Some("derive_bound".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![
+                    DeclarationId(230),
+                    DeclarationId(93),
+                    DeclarationId(959),
+                    DeclarationId(93),
+                ],
+                output: DeclarationId(1180),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    40636,
+                    41660,
+                )),
+            },
+            type_params: vec![],
+            phantom_params: 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", 40535, 41660),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1207),
+            name: Some("tree_traversal_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2514),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(599))),
+                inputs: vec![],
+                output: DeclarationId(1180),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    41993,
+                    42050,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39796,15 +40416,19 @@ 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", 4560, 4682),
+            span: SourceSpan::new("src/v3/std/induction.dag", 41954, 42050),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1198),
-            name: Some("_ci_wad_seed_list_declaration_empty".to_string()),
+            id: DeclarationId(1208),
+            name: Some("nested_iteration_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2515),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(601))),
+                output: DeclarationId(1180),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    42093,
+                    42151,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39814,15 +40438,19 @@ 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", 4876, 4945),
+            span: SourceSpan::new("src/v3/std/induction.dag", 42052, 42151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1199),
-            name: Some("_ci_wad_seed_list_behavior_empty".to_string()),
+            id: DeclarationId(1209),
+            name: Some("linear_scan_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2516),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(603))),
+                output: DeclarationId(1180),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    42251,
+                    42306,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39832,15 +40460,19 @@ 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", 4947, 5010),
+            span: SourceSpan::new("src/v3/std/induction.dag", 42215, 42306),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1200),
-            name: Some("_ci_wad_seed_list_dagport_empty".to_string()),
+            id: DeclarationId(1210),
+            name: Some("binary_search_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2517),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(605))),
+                output: DeclarationId(1180),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    42503,
+                    42618,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39850,15 +40482,19 @@ 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", 5012, 5073),
+            span: SourceSpan::new("src/v3/std/induction.dag", 42465, 42618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1201),
-            name: Some("_ci_wad_seed_list_cluster_empty".to_string()),
+            id: DeclarationId(1211),
+            name: Some("mergesort_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2518),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(607))),
+                output: DeclarationId(1180),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    42698,
+                    42813,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39868,15 +40504,19 @@ 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", 5075, 5136),
+            span: SourceSpan::new("src/v3/std/induction.dag", 42664, 42813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1202),
-            name: Some("_ci_wad_empty_list_diagnostic".to_string()),
+            id: DeclarationId(1212),
+            name: Some("karatsuba_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2519),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(609))),
+                output: DeclarationId(1180),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    42980,
+                    43099,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39886,15 +40526,19 @@ 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", 5138, 5200),
+            span: SourceSpan::new("src/v3/std/induction.dag", 42946, 43099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1203),
-            name: Some("_ci_wad_empty_list_witness_tm".to_string()),
+            id: DeclarationId(1213),
+            name: Some("strassen_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2521),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(611))),
+                output: DeclarationId(1180),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    43264,
+                    43378,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39904,15 +40548,19 @@ 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", 5202, 5280),
+            span: SourceSpan::new("src/v3/std/induction.dag", 43231, 43378),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1204),
-            name: Some("_ci_wad_witnesses_singleton_tm".to_string()),
+            id: DeclarationId(1214),
+            name: Some("trial_division_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1238)],
-                output: DeclarationId(2523),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(615))),
+                inputs: vec![],
+                output: DeclarationId(1180),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    43495,
+                    43520,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39922,15 +40570,19 @@ 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", 5282, 5443),
+            span: SourceSpan::new("src/v3/std/induction.dag", 43456, 43520),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1205),
-            name: Some("_ci_wad_violations_singleton".to_string()),
+            id: DeclarationId(1215),
+            name: Some("cube_root_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(982)],
-                output: DeclarationId(2524),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(618))),
+                inputs: vec![],
+                output: DeclarationId(1180),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    43555,
+                    43580,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39940,15 +40592,19 @@ 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", 5445, 5577),
+            span: SourceSpan::new("src/v3/std/induction.dag", 43521, 43580),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1206),
-            name: Some("_ci_wad_dimension_ok_tm_payload".to_string()),
+            id: DeclarationId(1216),
+            name: Some("kth_root_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1238)],
-                output: DeclarationId(2525),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(622))),
+                inputs: vec![DeclarationId(93)],
+                output: DeclarationId(1180),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    43662,
+                    43693,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39958,15 +40614,19 @@ 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", 5579, 5803),
+            span: SourceSpan::new("src/v3/std/induction.dag", 43623, 43693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1207),
-            name: Some("_ci_wad_dimension_fail_tm_payload".to_string()),
+            id: DeclarationId(1217),
+            name: Some("bfs_dfs_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1238), DeclarationId(982)],
-                output: DeclarationId(2526),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(627))),
+                inputs: vec![],
+                output: DeclarationId(1180),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    43929,
+                    43980,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39976,15 +40636,19 @@ 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", 5805, 6086),
+            span: SourceSpan::new("src/v3/std/induction.dag", 43897, 43980),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1208),
-            name: Some("report_dim_ok_tm".to_string()),
+            id: DeclarationId(1218),
+            name: Some("dijkstra_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(1238)],
-                output: DeclarationId(2527),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(634))),
+                inputs: vec![],
+                output: DeclarationId(1180),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    44071,
+                    44353,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39994,15 +40658,19 @@ 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", 6351, 6590),
+            span: SourceSpan::new("src/v3/std/induction.dag", 44038, 44353),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1209),
-            name: Some("report_dim_fail_tm".to_string()),
+            id: DeclarationId(1219),
+            name: Some("bellman_ford_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(1238), DeclarationId(982)],
-                output: DeclarationId(2528),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(641))),
+                inputs: vec![],
+                output: DeclarationId(1180),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    44456,
+                    44616,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40012,15 +40680,19 @@ 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", 6592, 6867),
+            span: SourceSpan::new("src/v3/std/induction.dag", 44419, 44616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1210),
-            name: Some("report_inhabits_branch_tm".to_string()),
+            id: DeclarationId(1220),
+            name: Some("floyd_warshall_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(1238), DeclarationId(986)],
-                output: DeclarationId(2529),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(646))),
+                inputs: vec![],
+                output: DeclarationId(1180),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    44723,
+                    44761,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40030,15 +40702,194 @@ 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", 6869, 7120),
+            span: SourceSpan::new("src/v3/std/induction.dag", 44684, 44761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1211),
-            name: Some("dimension_report_tm_from_witness".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(2530)],
-                output: DeclarationId(2531),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(656))),
+            id: DeclarationId(1221),
+            name: Some("TokenKind".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "KwLet".to_string(),
+                        ty: DeclarationId(2562),
+                    },
+                    Field {
+                        label: "KwIf".to_string(),
+                        ty: DeclarationId(2563),
+                    },
+                    Field {
+                        label: "KwThen".to_string(),
+                        ty: DeclarationId(2564),
+                    },
+                    Field {
+                        label: "KwElse".to_string(),
+                        ty: DeclarationId(2565),
+                    },
+                    Field {
+                        label: "KwFn".to_string(),
+                        ty: DeclarationId(2566),
+                    },
+                    Field {
+                        label: "KwType".to_string(),
+                        ty: DeclarationId(2567),
+                    },
+                    Field {
+                        label: "KwModule".to_string(),
+                        ty: DeclarationId(2568),
+                    },
+                    Field {
+                        label: "KwImport".to_string(),
+                        ty: DeclarationId(2569),
+                    },
+                    Field {
+                        label: "KwMatch".to_string(),
+                        ty: DeclarationId(2570),
+                    },
+                    Field {
+                        label: "KwData".to_string(),
+                        ty: DeclarationId(2571),
+                    },
+                    Field {
+                        label: "KwWhere".to_string(),
+                        ty: DeclarationId(2572),
+                    },
+                    Field {
+                        label: "KwTrue".to_string(),
+                        ty: DeclarationId(2573),
+                    },
+                    Field {
+                        label: "KwFalse".to_string(),
+                        ty: DeclarationId(2574),
+                    },
+                    Field {
+                        label: "Ident".to_string(),
+                        ty: DeclarationId(2575),
+                    },
+                    Field {
+                        label: "IntLit".to_string(),
+                        ty: DeclarationId(2576),
+                    },
+                    Field {
+                        label: "StringLit".to_string(),
+                        ty: DeclarationId(2577),
+                    },
+                    Field {
+                        label: "Eq".to_string(),
+                        ty: DeclarationId(2578),
+                    },
+                    Field {
+                        label: "EqEq".to_string(),
+                        ty: DeclarationId(2579),
+                    },
+                    Field {
+                        label: "NotEq".to_string(),
+                        ty: DeclarationId(2580),
+                    },
+                    Field {
+                        label: "Lt".to_string(),
+                        ty: DeclarationId(2581),
+                    },
+                    Field {
+                        label: "Le".to_string(),
+                        ty: DeclarationId(2582),
+                    },
+                    Field {
+                        label: "Gt".to_string(),
+                        ty: DeclarationId(2583),
+                    },
+                    Field {
+                        label: "Ge".to_string(),
+                        ty: DeclarationId(2584),
+                    },
+                    Field {
+                        label: "Plus".to_string(),
+                        ty: DeclarationId(2585),
+                    },
+                    Field {
+                        label: "Minus".to_string(),
+                        ty: DeclarationId(2586),
+                    },
+                    Field {
+                        label: "Star".to_string(),
+                        ty: DeclarationId(2587),
+                    },
+                    Field {
+                        label: "Slash".to_string(),
+                        ty: DeclarationId(2588),
+                    },
+                    Field {
+                        label: "AmpAmp".to_string(),
+                        ty: DeclarationId(2589),
+                    },
+                    Field {
+                        label: "PipePipe".to_string(),
+                        ty: DeclarationId(2590),
+                    },
+                    Field {
+                        label: "Colon".to_string(),
+                        ty: DeclarationId(2591),
+                    },
+                    Field {
+                        label: "Arrow".to_string(),
+                        ty: DeclarationId(2592),
+                    },
+                    Field {
+                        label: "FatArrow".to_string(),
+                        ty: DeclarationId(2593),
+                    },
+                    Field {
+                        label: "PipeArrow".to_string(),
+                        ty: DeclarationId(2594),
+                    },
+                    Field {
+                        label: "Dot".to_string(),
+                        ty: DeclarationId(2595),
+                    },
+                    Field {
+                        label: "LParen".to_string(),
+                        ty: DeclarationId(2596),
+                    },
+                    Field {
+                        label: "RParen".to_string(),
+                        ty: DeclarationId(2597),
+                    },
+                    Field {
+                        label: "LBrace".to_string(),
+                        ty: DeclarationId(2598),
+                    },
+                    Field {
+                        label: "RBrace".to_string(),
+                        ty: DeclarationId(2599),
+                    },
+                    Field {
+                        label: "LBracket".to_string(),
+                        ty: DeclarationId(2600),
+                    },
+                    Field {
+                        label: "RBracket".to_string(),
+                        ty: DeclarationId(2601),
+                    },
+                    Field {
+                        label: "Comma".to_string(),
+                        ty: DeclarationId(2602),
+                    },
+                    Field {
+                        label: "Semicolon".to_string(),
+                        ty: DeclarationId(2603),
+                    },
+                    Field {
+                        label: "Pipe".to_string(),
+                        ty: DeclarationId(2604),
+                    },
+                    Field {
+                        label: "Question".to_string(),
+                        ty: DeclarationId(2605),
+                    },
+                    Field {
+                        label: "Eof".to_string(),
+                        ty: DeclarationId(2606),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40048,15 +40899,22 @@ 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", 7122, 7541),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 627, 1220),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1212),
-            name: Some("demo_ci_modeled_timing_dimension_report".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2532),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(664))),
+            id: DeclarationId(1222),
+            name: Some("Token".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "kind".to_string(),
+                        ty: DeclarationId(1221),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40066,24 +40924,64 @@ 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", 8402, 8703),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1355, 1406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1213),
-            name: Some("DescentEvidence".to_string()),
+            id: DeclarationId(1223),
+            name: Some("KeywordTokenKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "Strict".to_string(),
-                        ty: DeclarationId(2562),
+                        label: "KwLet".to_string(),
+                        ty: DeclarationId(2607),
                     },
                     Field {
-                        label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2563),
+                        label: "KwIf".to_string(),
+                        ty: DeclarationId(2608),
                     },
                     Field {
-                        label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2564),
+                        label: "KwThen".to_string(),
+                        ty: DeclarationId(2609),
+                    },
+                    Field {
+                        label: "KwElse".to_string(),
+                        ty: DeclarationId(2610),
+                    },
+                    Field {
+                        label: "KwFn".to_string(),
+                        ty: DeclarationId(2611),
+                    },
+                    Field {
+                        label: "KwType".to_string(),
+                        ty: DeclarationId(2612),
+                    },
+                    Field {
+                        label: "KwModule".to_string(),
+                        ty: DeclarationId(2613),
+                    },
+                    Field {
+                        label: "KwImport".to_string(),
+                        ty: DeclarationId(2614),
+                    },
+                    Field {
+                        label: "KwMatch".to_string(),
+                        ty: DeclarationId(2615),
+                    },
+                    Field {
+                        label: "KwData".to_string(),
+                        ty: DeclarationId(2616),
+                    },
+                    Field {
+                        label: "KwWhere".to_string(),
+                        ty: DeclarationId(2617),
+                    },
+                    Field {
+                        label: "KwTrue".to_string(),
+                        ty: DeclarationId(2618),
+                    },
+                    Field {
+                        label: "KwFalse".to_string(),
+                        ty: DeclarationId(2619),
                     },
                 ],
             },
@@ -40095,15 +40993,126 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 742, 810),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1765, 1931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1214),
-            name: Some("evidence_rank".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1213)],
-                output: DeclarationId(93),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/termination.dag", 856, 938)),
+            id: DeclarationId(1224),
+            name: Some("PunctTokenKind".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "Eq".to_string(),
+                        ty: DeclarationId(2620),
+                    },
+                    Field {
+                        label: "EqEq".to_string(),
+                        ty: DeclarationId(2621),
+                    },
+                    Field {
+                        label: "NotEq".to_string(),
+                        ty: DeclarationId(2622),
+                    },
+                    Field {
+                        label: "Lt".to_string(),
+                        ty: DeclarationId(2623),
+                    },
+                    Field {
+                        label: "Le".to_string(),
+                        ty: DeclarationId(2624),
+                    },
+                    Field {
+                        label: "Gt".to_string(),
+                        ty: DeclarationId(2625),
+                    },
+                    Field {
+                        label: "Ge".to_string(),
+                        ty: DeclarationId(2626),
+                    },
+                    Field {
+                        label: "Plus".to_string(),
+                        ty: DeclarationId(2627),
+                    },
+                    Field {
+                        label: "Minus".to_string(),
+                        ty: DeclarationId(2628),
+                    },
+                    Field {
+                        label: "Star".to_string(),
+                        ty: DeclarationId(2629),
+                    },
+                    Field {
+                        label: "Slash".to_string(),
+                        ty: DeclarationId(2630),
+                    },
+                    Field {
+                        label: "AmpAmp".to_string(),
+                        ty: DeclarationId(2631),
+                    },
+                    Field {
+                        label: "PipePipe".to_string(),
+                        ty: DeclarationId(2632),
+                    },
+                    Field {
+                        label: "Colon".to_string(),
+                        ty: DeclarationId(2633),
+                    },
+                    Field {
+                        label: "Arrow".to_string(),
+                        ty: DeclarationId(2634),
+                    },
+                    Field {
+                        label: "FatArrow".to_string(),
+                        ty: DeclarationId(2635),
+                    },
+                    Field {
+                        label: "PipeArrow".to_string(),
+                        ty: DeclarationId(2636),
+                    },
+                    Field {
+                        label: "Dot".to_string(),
+                        ty: DeclarationId(2637),
+                    },
+                    Field {
+                        label: "LParen".to_string(),
+                        ty: DeclarationId(2638),
+                    },
+                    Field {
+                        label: "RParen".to_string(),
+                        ty: DeclarationId(2639),
+                    },
+                    Field {
+                        label: "LBrace".to_string(),
+                        ty: DeclarationId(2640),
+                    },
+                    Field {
+                        label: "RBrace".to_string(),
+                        ty: DeclarationId(2641),
+                    },
+                    Field {
+                        label: "LBracket".to_string(),
+                        ty: DeclarationId(2642),
+                    },
+                    Field {
+                        label: "RBracket".to_string(),
+                        ty: DeclarationId(2643),
+                    },
+                    Field {
+                        label: "Comma".to_string(),
+                        ty: DeclarationId(2644),
+                    },
+                    Field {
+                        label: "Semicolon".to_string(),
+                        ty: DeclarationId(2645),
+                    },
+                    Field {
+                        label: "Pipe".to_string(),
+                        ty: DeclarationId(2646),
+                    },
+                    Field {
+                        label: "Question".to_string(),
+                        ty: DeclarationId(2647),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40113,19 +41122,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 812, 938),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2347, 2653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1215),
-            name: Some("merge_evidence".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1213), DeclarationId(1213)],
-                output: DeclarationId(1213),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/termination.dag",
-                    1082,
-                    1410,
-                )),
+            id: DeclarationId(1225),
+            name: Some("LocalPunctSpec".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "pattern".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "kind".to_string(),
+                        ty: DeclarationId(1224),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40135,19 +41147,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 1005, 1410),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2863, 2927),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1216),
-            name: Some("join_evidence".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1213), DeclarationId(1213)],
-                output: DeclarationId(1213),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/termination.dag",
-                    1556,
-                    1755,
-                )),
+            id: DeclarationId(1226),
+            name: Some("StringEscapeSpec".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "suffix".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "output_codepoint".to_string(),
+                        ty: DeclarationId(93),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40157,19 +41172,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 1480, 1755),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 3314, 3380),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1217),
-            name: Some("promote_to_strict".to_string()),
+            id: DeclarationId(1227),
+            name: Some("behavior_spine".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1213)],
-                output: DeclarationId(1213),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/termination.dag",
-                    2217,
-                    2336,
-                )),
+                inputs: vec![DeclarationId(828)],
+                output: DeclarationId(2648),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(557))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40179,19 +41190,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 2150, 2336),
+            span: SourceSpan::new("src/v3/std/workflows.dag", 963, 1018),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1218),
-            name: Some("optional_evidence_meet".to_string()),
+            id: DeclarationId(1228),
+            name: Some("timing_lens_module_path_witness".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2554), DeclarationId(2555)],
-                output: DeclarationId(2556),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/termination.dag",
-                    2488,
-                    2664,
-                )),
+                inputs: vec![],
+                output: DeclarationId(158),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(559))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40201,19 +41208,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 2400, 2664),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 1517, 1598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1219),
-            name: Some("map_evidence_merge_at".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2557), DeclarationId(230), DeclarationId(1213)],
-                output: DeclarationId(2558),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/termination.dag",
-                    2833,
-                    3007,
-                )),
+            id: DeclarationId(1229),
+            name: Some("Nanoseconds".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "count".to_string(),
+                    ty: DeclarationId(76),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40223,32 +41227,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 2701, 3007),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 2059, 2092),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1220),
-            name: Some("RankingDimension".to_string()),
+            id: DeclarationId(1230),
+            name: Some("TimingMeasurement".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "TreeSize".to_string(),
-                        ty: DeclarationId(2565),
-                    },
-                    Field {
-                        label: "ListLength".to_string(),
-                        ty: DeclarationId(2566),
+                        label: "Observed".to_string(),
+                        ty: DeclarationId(2651),
                     },
                     Field {
-                        label: "ArithmeticValue".to_string(),
-                        ty: DeclarationId(2567),
+                        label: "Unobserved".to_string(),
+                        ty: DeclarationId(2652),
                     },
                     Field {
-                        label: "TokenPosition".to_string(),
-                        ty: DeclarationId(2568),
+                        label: "Ambiguous".to_string(),
+                        ty: DeclarationId(2653),
                     },
                     Field {
-                        label: "SetCardinality".to_string(),
-                        ty: DeclarationId(2569),
+                        label: "Stale".to_string(),
+                        ty: DeclarationId(2654),
                     },
                 ],
             },
@@ -40260,20 +41260,40 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 3306, 3502),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 4103, 4203),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1221),
-            name: Some("PositiveDescentAmount".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
+            id: DeclarationId(1231),
+            name: Some("WorkflowObservationAnchor".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
                     Field {
-                        label: "OneStep".to_string(),
-                        ty: DeclarationId(2570),
+                        label: "subject_node".to_string(),
+                        ty: DeclarationId(721),
                     },
                     Field {
-                        label: "AdditionalStep".to_string(),
-                        ty: DeclarationId(2571),
+                        label: "artifact_digest".to_string(),
+                        ty: DeclarationId(173),
+                    },
+                    Field {
+                        label: "producer_id".to_string(),
+                        ty: DeclarationId(174),
+                    },
+                    Field {
+                        label: "observer_id".to_string(),
+                        ty: DeclarationId(175),
+                    },
+                    Field {
+                        label: "prover_id".to_string(),
+                        ty: DeclarationId(176),
+                    },
+                    Field {
+                        label: "attached_at_ns".to_string(),
+                        ty: DeclarationId(1229),
+                    },
+                    Field {
+                        label: "workflow_run_id".to_string(),
+                        ty: DeclarationId(177),
                     },
                 ],
             },
@@ -40285,42 +41305,32 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 4478, 4571),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1222),
-            name: Some("positive_descent_count".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1221)],
-                output: DeclarationId(93),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/termination.dag",
-                    4881,
-                    4989,
-                )),
-            },
-            type_params: vec![],
-            phantom_params: 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", 4818, 4989),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 5664, 5913),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1223),
-            name: Some("ProportionalDivisor".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
+            id: DeclarationId(1232),
+            name: Some("FileAttachment".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
                     Field {
-                        label: "DivideByTwo".to_string(),
-                        ty: DeclarationId(2572),
+                        label: "subject_node".to_string(),
+                        ty: DeclarationId(721),
                     },
                     Field {
-                        label: "StrictlyLarger".to_string(),
-                        ty: DeclarationId(2573),
+                        label: "content_digest".to_string(),
+                        ty: DeclarationId(173),
+                    },
+                    Field {
+                        label: "producer_id".to_string(),
+                        ty: DeclarationId(174),
+                    },
+                    Field {
+                        label: "workflow_run_id".to_string(),
+                        ty: DeclarationId(177),
+                    },
+                    Field {
+                        label: "attached_at_ns".to_string(),
+                        ty: DeclarationId(1229),
                     },
                 ],
             },
@@ -40332,19 +41342,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 5455, 5545),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 6672, 6845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1224),
-            name: Some("proportional_divisor_to_int".to_string()),
+            id: DeclarationId(1233),
+            name: Some("gate_62_file_attachment_demo_record".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1223)],
-                output: DeclarationId(93),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/termination.dag",
-                    5609,
-                    5722,
-                )),
+                inputs: vec![
+                    DeclarationId(721),
+                    DeclarationId(173),
+                    DeclarationId(174),
+                    DeclarationId(177),
+                    DeclarationId(1229),
+                ],
+                output: DeclarationId(1232),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(561))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40354,19 +41366,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 5547, 5722),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7246, 7573),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1225),
-            name: Some("peano_literal_materialization_cap".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(93),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/termination.dag",
-                    5952,
-                    5959,
-                )),
+            id: DeclarationId(1234),
+            name: Some("TimingObservationSet".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "observations".to_string(),
+                    ty: DeclarationId(2655),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40376,19 +41385,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 5906, 5959),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7657, 7731),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1226),
-            name: Some("positive_descent_amount_from_positive_int".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(93)],
-                output: DeclarationId(2559),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/termination.dag",
-                    6420,
-                    6780,
-                )),
+            id: DeclarationId(1235),
+            name: Some("TimingObservationEntry".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "anchor".to_string(),
+                        ty: DeclarationId(1231),
+                    },
+                    Field {
+                        label: "measurement".to_string(),
+                        ty: DeclarationId(1230),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40398,19 +41410,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 6341, 6780),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7733, 7833),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1227),
-            name: Some("proportional_divisor_from_int_at_least_two".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(93)],
-                output: DeclarationId(2560),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/termination.dag",
-                    6860,
-                    7221,
-                )),
+            id: DeclarationId(1236),
+            name: Some("TimingBudget".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "max".to_string(),
+                    ty: DeclarationId(1229),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40420,40 +41429,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 6782, 7221),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7971, 8011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1228),
-            name: Some("DescentSource".to_string()),
+            id: DeclarationId(1237),
+            name: Some("TimingEnforcementProjected".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "ChildAccessor".to_string(),
-                        ty: DeclarationId(2574),
-                    },
-                    Field {
-                        label: "ListShrink".to_string(),
-                        ty: DeclarationId(2575),
-                    },
-                    Field {
-                        label: "ArithmeticSubtractDescent".to_string(),
-                        ty: DeclarationId(2576),
-                    },
-                    Field {
-                        label: "ArithmeticDivideDescent".to_string(),
-                        ty: DeclarationId(2577),
-                    },
-                    Field {
-                        label: "ParserAdvance".to_string(),
-                        ty: DeclarationId(2578),
-                    },
-                    Field {
-                        label: "SetRemoval".to_string(),
-                        ty: DeclarationId(2579),
+                        label: "TimedUsage".to_string(),
+                        ty: DeclarationId(2656),
                     },
                     Field {
-                        label: "FoldIteration".to_string(),
-                        ty: DeclarationId(2580),
+                        label: "NonEvidenceUsage".to_string(),
+                        ty: DeclarationId(2657),
                     },
                 ],
             },
@@ -40465,15 +41454,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 7626, 7947),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9177, 9265),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1229),
-            name: Some("TerminationProof".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "dimensions".to_string(),
-                    ty: DeclarationId(2581),
+            id: DeclarationId(1238),
+            name: Some("TimingLens".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1080),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1081),
+                    value: DeclarationId(1230),
                 }],
             },
             type_params: vec![],
@@ -40484,26 +41474,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 7949, 8011),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9521, 9562),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1230),
-            name: Some("ProofEdge".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "caller".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "callee".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "evidence".to_string(),
-                        ty: DeclarationId(2582),
-                    },
-                ],
+            id: DeclarationId(1239),
+            name: Some("timing_measurement_unobserved".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![],
+                output: DeclarationId(1230),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(563))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40513,16 +41492,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 8156, 8242),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9564, 9634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1231),
-            name: Some("StrictEvidence".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![Field {
-                    label: "Strict".to_string(),
-                    ty: DeclarationId(2583),
-                }],
+            id: DeclarationId(1240),
+            name: Some("timing_measurement_lens_combine".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1230), DeclarationId(1230), DeclarationId(128)],
+                output: DeclarationId(1230),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(595))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40532,22 +41510,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 8716, 8746),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9792, 10684),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1232),
-            name: Some("NonStrictEvidence".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2584),
-                    },
-                    Field {
-                        label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2585),
-                    },
-                ],
+            id: DeclarationId(1241),
+            name: Some("timing_sequential_op".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1230), DeclarationId(1230)],
+                output: DeclarationId(1230),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(598))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40557,22 +41528,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 9112, 9171),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10759, 10895),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1233),
-            name: Some("DescentResidual".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "EvidenceUnknown".to_string(),
-                        ty: DeclarationId(2586),
-                    },
-                    Field {
-                        label: "EvidenceIncomplete".to_string(),
-                        ty: DeclarationId(2587),
-                    },
-                ],
+            id: DeclarationId(1242),
+            name: Some("nanoseconds_zero".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![],
+                output: DeclarationId(1229),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(601))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40582,26 +41546,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 10238, 10320),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10897, 10950),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1234),
-            name: Some("DescentExecutionProof".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "cluster".to_string(),
-                        ty: DeclarationId(724),
-                    },
-                    Field {
-                        label: "port".to_string(),
-                        ty: DeclarationId(722),
-                    },
-                    Field {
-                        label: "per_path".to_string(),
-                        ty: DeclarationId(2588),
-                    },
-                ],
+            id: DeclarationId(1243),
+            name: Some("timing_sequential_identity".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![],
+                output: DeclarationId(1230),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(604))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40611,19 +41564,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 11157, 11263),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10952, 11050),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1235),
-            name: Some("descent_execution_proof".to_string()),
+            id: DeclarationId(1244),
+            name: Some("timing_branch_op".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(724), DeclarationId(722)],
-                output: DeclarationId(2561),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/termination.dag",
-                    12400,
-                    12439,
-                )),
+                inputs: vec![DeclarationId(1230), DeclarationId(1230)],
+                output: DeclarationId(1230),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(607))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40633,15 +41582,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 12279, 12439),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11110, 11243),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1236),
-            name: Some("timing_lens_module_path_witness".to_string()),
+            id: DeclarationId(1245),
+            name: Some("timing_lens_empty_corrections".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(158),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(666))),
+                output: DeclarationId(2649),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(609))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40651,16 +41600,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 1419, 1500),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11245, 11309),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1237),
-            name: Some("Nanoseconds".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "count".to_string(),
-                    ty: DeclarationId(76),
-                }],
+            id: DeclarationId(1246),
+            name: Some("timing_lens_behavior_span".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(827)],
+                output: DeclarationId(159),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(616))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40670,30 +41618,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 1961, 1994),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11492, 11691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1238),
-            name: Some("TimingMeasurement".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Observed".to_string(),
-                        ty: DeclarationId(2591),
-                    },
-                    Field {
-                        label: "Unobserved".to_string(),
-                        ty: DeclarationId(2592),
-                    },
-                    Field {
-                        label: "Ambiguous".to_string(),
-                        ty: DeclarationId(2593),
-                    },
-                    Field {
-                        label: "Stale".to_string(),
-                        ty: DeclarationId(2594),
-                    },
-                ],
+            id: DeclarationId(1247),
+            name: Some("timing_lens_scaffold_non_evidence_diagnostic".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(230), DeclarationId(159)],
+                output: DeclarationId(1039),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(621))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40703,42 +41636,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 4005, 4105),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11938, 12150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1239),
-            name: Some("WorkflowObservationAnchor".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "subject_node".to_string(),
-                        ty: DeclarationId(721),
-                    },
-                    Field {
-                        label: "artifact_digest".to_string(),
-                        ty: DeclarationId(173),
-                    },
-                    Field {
-                        label: "producer_id".to_string(),
-                        ty: DeclarationId(174),
-                    },
-                    Field {
-                        label: "observer_id".to_string(),
-                        ty: DeclarationId(175),
-                    },
-                    Field {
-                        label: "prover_id".to_string(),
-                        ty: DeclarationId(176),
-                    },
-                    Field {
-                        label: "attached_at_ns".to_string(),
-                        ty: DeclarationId(1237),
-                    },
-                    Field {
-                        label: "workflow_run_id".to_string(),
-                        ty: DeclarationId(177),
-                    },
-                ],
+            id: DeclarationId(1248),
+            name: Some("timing_lens_degenerate_empty_dag_span".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![],
+                output: DeclarationId(159),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(626))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 12384, 12518),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1249),
+            name: Some("timing_lens_validate_non_observed".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(230)],
+                output: DeclarationId(1043),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(642))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40748,34 +41672,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 5566, 5815),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12980, 13685),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1240),
-            name: Some("FileAttachment".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "subject_node".to_string(),
-                        ty: DeclarationId(721),
-                    },
-                    Field {
-                        label: "content_digest".to_string(),
-                        ty: DeclarationId(173),
-                    },
-                    Field {
-                        label: "producer_id".to_string(),
-                        ty: DeclarationId(174),
-                    },
-                    Field {
-                        label: "workflow_run_id".to_string(),
-                        ty: DeclarationId(177),
-                    },
-                    Field {
-                        label: "attached_at_ns".to_string(),
-                        ty: DeclarationId(1237),
-                    },
-                ],
+            id: DeclarationId(1250),
+            name: Some("timing_measurement_iterate".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1230), DeclarationId(818)],
+                output: DeclarationId(1230),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(651))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40785,21 +41690,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 6574, 6747),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14010, 14371),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1241),
-            name: Some("gate_62_file_attachment_demo_record".to_string()),
+            id: DeclarationId(1251),
+            name: Some("timing_lens_read".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![
-                    DeclarationId(721),
-                    DeclarationId(173),
-                    DeclarationId(174),
-                    DeclarationId(177),
-                    DeclarationId(1237),
-                ],
-                output: DeclarationId(1240),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(668))),
+                inputs: vec![DeclarationId(828), DeclarationId(827)],
+                output: DeclarationId(2650),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(688))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40809,16 +41708,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7148, 7475),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15148, 15974),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1242),
-            name: Some("TimingObservationSet".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "observations".to_string(),
-                    ty: DeclarationId(2595),
-                }],
+            id: DeclarationId(1252),
+            name: Some("timing_lens_validate".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(1230)],
+                output: DeclarationId(1043),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(702))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40828,22 +41726,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7559, 7633),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15976, 16821),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1243),
-            name: Some("TimingObservationEntry".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "anchor".to_string(),
-                        ty: DeclarationId(1239),
-                    },
-                    Field {
-                        label: "measurement".to_string(),
-                        ty: DeclarationId(1238),
-                    },
-                ],
+            id: DeclarationId(1253),
+            name: Some("timing_enforcement_fault_sentinel_count".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![],
+                output: DeclarationId(76),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(704))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40853,16 +41744,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7635, 7735),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 17931, 18005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1244),
-            name: Some("TimingBudget".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "max".to_string(),
-                    ty: DeclarationId(1237),
-                }],
+            id: DeclarationId(1254),
+            name: Some("timing_enforcement_project".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1230)],
+                output: DeclarationId(1237),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(711))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40872,107 +41762,214 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7873, 7913),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18007, 18259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1245),
-            name: Some("TimingLens".to_string()),
+            id: DeclarationId(1255),
+            name: Some("timing_enforcement_violates".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1230), DeclarationId(1236)],
+                output: DeclarationId(128),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(734))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 18261, 18526),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1256),
+            name: Some("timing_lens_monoid".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1128),
+                template: DeclarationId(19),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1129),
-                    value: DeclarationId(1238),
+                    parameter: DeclarationId(20),
+                    value: DeclarationId(1230),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(2658)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(1241))),
+                    (
+                        "identity".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2651),
+                            payload: vec![FieldValue::Record(vec![(
+                                "count".to_string(),
+                                FieldValue::Literal(LiteralBits::Int("0".to_string())),
+                            )])],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8169, 8210),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18528, 18659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1246),
-            name: Some("timing_measurement_unobserved".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1238),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(670))),
+            id: DeclarationId(1257),
+            name: Some("timing_lens".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1238),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1238)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "name".to_string(),
+                        FieldValue::Literal(LiteralBits::String("timing".to_string())),
+                    ),
+                    (
+                        "read".to_string(),
+                        FieldValue::Reference(DeclarationId(1251)),
+                    ),
+                    (
+                        "sequential".to_string(),
+                        FieldValue::Reference(DeclarationId(1256)),
+                    ),
+                    (
+                        "branch".to_string(),
+                        FieldValue::Reference(DeclarationId(1244)),
+                    ),
+                    (
+                        "iterate".to_string(),
+                        FieldValue::Reference(DeclarationId(1250)),
+                    ),
+                    (
+                        "validate".to_string(),
+                        FieldValue::Reference(DeclarationId(1252)),
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8212, 8282),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18661, 18868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1247),
-            name: Some("timing_measurement_lens_combine".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1238), DeclarationId(1238), DeclarationId(128)],
-                output: DeclarationId(1238),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(702))),
+            id: DeclarationId(1258),
+            name: Some("timing_enforcement".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1084),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1085),
+                        value: DeclarationId(1230),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1086),
+                        value: DeclarationId(1236),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1087),
+                        value: DeclarationId(1237),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(2659)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "project".to_string(),
+                        FieldValue::Reference(DeclarationId(1254)),
+                    ),
+                    (
+                        "violates".to_string(),
+                        FieldValue::Reference(DeclarationId(1255)),
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8440, 9332),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18870, 19055),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1248),
-            name: Some("timing_sequential_op".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1238), DeclarationId(1238)],
-                output: DeclarationId(1238),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(705))),
+            id: DeclarationId(1259),
+            name: Some("timing_enforceable".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1088),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1089),
+                        value: DeclarationId(1230),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1090),
+                        value: DeclarationId(1236),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1091),
+                        value: DeclarationId(1237),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(2660)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "lens".to_string(),
+                        FieldValue::Reference(DeclarationId(1257)),
+                    ),
+                    (
+                        "enforcement".to_string(),
+                        FieldValue::Reference(DeclarationId(1258)),
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9407, 9543),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 19057, 19218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1249),
-            name: Some("nanoseconds_zero".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1237),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(708))),
+            id: DeclarationId(1260),
+            name: Some("modeled_gunbc_ci_workflow".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1759),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1759)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Unparsed(SourceSpan::new(
+                "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                1399,
+                2655,
+            ))),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9545, 9598),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 1356, 2655),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1250),
-            name: Some("timing_sequential_identity".to_string()),
+            id: DeclarationId(1261),
+            name: Some("ci_demo_timing_read".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1238),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(711))),
+                inputs: vec![DeclarationId(828), DeclarationId(827)],
+                output: DeclarationId(2672),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(776))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40982,15 +41979,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9600, 9698),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3168, 4427),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1251),
-            name: Some("timing_branch_op".to_string()),
+            id: DeclarationId(1262),
+            name: Some("ci_wad_modeled_workflow_timing_witness".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1238), DeclarationId(1238)],
-                output: DeclarationId(1238),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(714))),
+                inputs: vec![DeclarationId(828), DeclarationId(827)],
+                output: DeclarationId(2673),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(778))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -41000,15 +41997,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9758, 9891),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4721, 4843),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1252),
-            name: Some("timing_lens_empty_corrections".to_string()),
+            id: DeclarationId(1263),
+            name: Some("_ci_wad_seed_list_declaration_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2589),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(716))),
+                output: DeclarationId(2674),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(780))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -41018,15 +42015,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9893, 9957),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5037, 5106),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1253),
-            name: Some("timing_lens_behavior_span".to_string()),
+            id: DeclarationId(1264),
+            name: Some("_ci_wad_seed_list_behavior_empty".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(827)],
-                output: DeclarationId(159),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(723))),
+                inputs: vec![],
+                output: DeclarationId(2675),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(782))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -41036,15 +42033,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10140, 10339),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5108, 5171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1254),
-            name: Some("timing_lens_scaffold_non_evidence_diagnostic".to_string()),
+            id: DeclarationId(1265),
+            name: Some("_ci_wad_seed_list_dagport_empty".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(230), DeclarationId(159)],
-                output: DeclarationId(982),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(728))),
+                inputs: vec![],
+                output: DeclarationId(2676),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(784))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -41054,15 +42051,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10586, 10798),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5173, 5234),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1255),
-            name: Some("timing_lens_degenerate_empty_dag_span".to_string()),
+            id: DeclarationId(1266),
+            name: Some("_ci_wad_seed_list_cluster_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(159),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(733))),
+                output: DeclarationId(2677),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(786))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -41072,15 +42069,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11032, 11166),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5236, 5297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1256),
-            name: Some("timing_lens_validate_non_observed".to_string()),
+            id: DeclarationId(1267),
+            name: Some("_ci_wad_empty_list_diagnostic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(230)],
-                output: DeclarationId(986),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(749))),
+                inputs: vec![],
+                output: DeclarationId(2678),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(788))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -41090,15 +42087,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11628, 12333),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5299, 5361),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1257),
-            name: Some("timing_measurement_iterate".to_string()),
+            id: DeclarationId(1268),
+            name: Some("_ci_wad_empty_list_witness_tm".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1238), DeclarationId(818)],
-                output: DeclarationId(1238),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(758))),
+                inputs: vec![],
+                output: DeclarationId(2680),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(790))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -41108,15 +42105,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12658, 13019),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5363, 5441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1258),
-            name: Some("timing_lens_read".to_string()),
+            id: DeclarationId(1269),
+            name: Some("_ci_wad_witnesses_singleton_tm".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2590),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(795))),
+                inputs: vec![DeclarationId(1230)],
+                output: DeclarationId(2682),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(794))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -41126,15 +42123,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13796, 14622),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5443, 5604),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1259),
-            name: Some("timing_lens_validate".to_string()),
+            id: DeclarationId(1270),
+            name: Some("_ci_wad_violations_singleton".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(1238)],
-                output: DeclarationId(986),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(809))),
+                inputs: vec![DeclarationId(1039)],
+                output: DeclarationId(2683),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(797))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -41144,194 +42141,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14624, 15469),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5606, 5738),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1260),
-            name: Some("TokenKind".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "KwLet".to_string(),
-                        ty: DeclarationId(2607),
-                    },
-                    Field {
-                        label: "KwIf".to_string(),
-                        ty: DeclarationId(2608),
-                    },
-                    Field {
-                        label: "KwThen".to_string(),
-                        ty: DeclarationId(2609),
-                    },
-                    Field {
-                        label: "KwElse".to_string(),
-                        ty: DeclarationId(2610),
-                    },
-                    Field {
-                        label: "KwFn".to_string(),
-                        ty: DeclarationId(2611),
-                    },
-                    Field {
-                        label: "KwType".to_string(),
-                        ty: DeclarationId(2612),
-                    },
-                    Field {
-                        label: "KwModule".to_string(),
-                        ty: DeclarationId(2613),
-                    },
-                    Field {
-                        label: "KwImport".to_string(),
-                        ty: DeclarationId(2614),
-                    },
-                    Field {
-                        label: "KwMatch".to_string(),
-                        ty: DeclarationId(2615),
-                    },
-                    Field {
-                        label: "KwData".to_string(),
-                        ty: DeclarationId(2616),
-                    },
-                    Field {
-                        label: "KwWhere".to_string(),
-                        ty: DeclarationId(2617),
-                    },
-                    Field {
-                        label: "KwTrue".to_string(),
-                        ty: DeclarationId(2618),
-                    },
-                    Field {
-                        label: "KwFalse".to_string(),
-                        ty: DeclarationId(2619),
-                    },
-                    Field {
-                        label: "Ident".to_string(),
-                        ty: DeclarationId(2620),
-                    },
-                    Field {
-                        label: "IntLit".to_string(),
-                        ty: DeclarationId(2621),
-                    },
-                    Field {
-                        label: "StringLit".to_string(),
-                        ty: DeclarationId(2622),
-                    },
-                    Field {
-                        label: "Eq".to_string(),
-                        ty: DeclarationId(2623),
-                    },
-                    Field {
-                        label: "EqEq".to_string(),
-                        ty: DeclarationId(2624),
-                    },
-                    Field {
-                        label: "NotEq".to_string(),
-                        ty: DeclarationId(2625),
-                    },
-                    Field {
-                        label: "Lt".to_string(),
-                        ty: DeclarationId(2626),
-                    },
-                    Field {
-                        label: "Le".to_string(),
-                        ty: DeclarationId(2627),
-                    },
-                    Field {
-                        label: "Gt".to_string(),
-                        ty: DeclarationId(2628),
-                    },
-                    Field {
-                        label: "Ge".to_string(),
-                        ty: DeclarationId(2629),
-                    },
-                    Field {
-                        label: "Plus".to_string(),
-                        ty: DeclarationId(2630),
-                    },
-                    Field {
-                        label: "Minus".to_string(),
-                        ty: DeclarationId(2631),
-                    },
-                    Field {
-                        label: "Star".to_string(),
-                        ty: DeclarationId(2632),
-                    },
-                    Field {
-                        label: "Slash".to_string(),
-                        ty: DeclarationId(2633),
-                    },
-                    Field {
-                        label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2634),
-                    },
-                    Field {
-                        label: "PipePipe".to_string(),
-                        ty: DeclarationId(2635),
-                    },
-                    Field {
-                        label: "Colon".to_string(),
-                        ty: DeclarationId(2636),
-                    },
-                    Field {
-                        label: "Arrow".to_string(),
-                        ty: DeclarationId(2637),
-                    },
-                    Field {
-                        label: "FatArrow".to_string(),
-                        ty: DeclarationId(2638),
-                    },
-                    Field {
-                        label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2639),
-                    },
-                    Field {
-                        label: "Dot".to_string(),
-                        ty: DeclarationId(2640),
-                    },
-                    Field {
-                        label: "LParen".to_string(),
-                        ty: DeclarationId(2641),
-                    },
-                    Field {
-                        label: "RParen".to_string(),
-                        ty: DeclarationId(2642),
-                    },
-                    Field {
-                        label: "LBrace".to_string(),
-                        ty: DeclarationId(2643),
-                    },
-                    Field {
-                        label: "RBrace".to_string(),
-                        ty: DeclarationId(2644),
-                    },
-                    Field {
-                        label: "LBracket".to_string(),
-                        ty: DeclarationId(2645),
-                    },
-                    Field {
-                        label: "RBracket".to_string(),
-                        ty: DeclarationId(2646),
-                    },
-                    Field {
-                        label: "Comma".to_string(),
-                        ty: DeclarationId(2647),
-                    },
-                    Field {
-                        label: "Semicolon".to_string(),
-                        ty: DeclarationId(2648),
-                    },
-                    Field {
-                        label: "Pipe".to_string(),
-                        ty: DeclarationId(2649),
-                    },
-                    Field {
-                        label: "Question".to_string(),
-                        ty: DeclarationId(2650),
-                    },
-                    Field {
-                        label: "Eof".to_string(),
-                        ty: DeclarationId(2651),
-                    },
-                ],
+            id: DeclarationId(1271),
+            name: Some("_ci_wad_dimension_ok_tm_payload".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1230)],
+                output: DeclarationId(2684),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(801))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -41341,22 +42159,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 627, 1220),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5740, 5964),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1261),
-            name: Some("Token".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "kind".to_string(),
-                        ty: DeclarationId(1260),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
+            id: DeclarationId(1272),
+            name: Some("_ci_wad_dimension_fail_tm_payload".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1230), DeclarationId(1039)],
+                output: DeclarationId(2685),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(806))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -41366,66 +42177,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1355, 1406),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5966, 6247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1262),
-            name: Some("KeywordTokenKind".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "KwLet".to_string(),
-                        ty: DeclarationId(2652),
-                    },
-                    Field {
-                        label: "KwIf".to_string(),
-                        ty: DeclarationId(2653),
-                    },
-                    Field {
-                        label: "KwThen".to_string(),
-                        ty: DeclarationId(2654),
-                    },
-                    Field {
-                        label: "KwElse".to_string(),
-                        ty: DeclarationId(2655),
-                    },
-                    Field {
-                        label: "KwFn".to_string(),
-                        ty: DeclarationId(2656),
-                    },
-                    Field {
-                        label: "KwType".to_string(),
-                        ty: DeclarationId(2657),
-                    },
-                    Field {
-                        label: "KwModule".to_string(),
-                        ty: DeclarationId(2658),
-                    },
-                    Field {
-                        label: "KwImport".to_string(),
-                        ty: DeclarationId(2659),
-                    },
-                    Field {
-                        label: "KwMatch".to_string(),
-                        ty: DeclarationId(2660),
-                    },
-                    Field {
-                        label: "KwData".to_string(),
-                        ty: DeclarationId(2661),
-                    },
-                    Field {
-                        label: "KwWhere".to_string(),
-                        ty: DeclarationId(2662),
-                    },
-                    Field {
-                        label: "KwTrue".to_string(),
-                        ty: DeclarationId(2663),
-                    },
-                    Field {
-                        label: "KwFalse".to_string(),
-                        ty: DeclarationId(2664),
-                    },
-                ],
+            id: DeclarationId(1273),
+            name: Some("report_dim_ok_tm".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(1230)],
+                output: DeclarationId(2686),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(813))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 6512, 6751),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1274),
+            name: Some("report_dim_fail_tm".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(1230), DeclarationId(1039)],
+                output: DeclarationId(2687),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(820))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -41435,126 +42213,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1765, 1931),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6753, 7028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1263),
-            name: Some("PunctTokenKind".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Eq".to_string(),
-                        ty: DeclarationId(2665),
-                    },
-                    Field {
-                        label: "EqEq".to_string(),
-                        ty: DeclarationId(2666),
-                    },
-                    Field {
-                        label: "NotEq".to_string(),
-                        ty: DeclarationId(2667),
-                    },
-                    Field {
-                        label: "Lt".to_string(),
-                        ty: DeclarationId(2668),
-                    },
-                    Field {
-                        label: "Le".to_string(),
-                        ty: DeclarationId(2669),
-                    },
-                    Field {
-                        label: "Gt".to_string(),
-                        ty: DeclarationId(2670),
-                    },
-                    Field {
-                        label: "Ge".to_string(),
-                        ty: DeclarationId(2671),
-                    },
-                    Field {
-                        label: "Plus".to_string(),
-                        ty: DeclarationId(2672),
-                    },
-                    Field {
-                        label: "Minus".to_string(),
-                        ty: DeclarationId(2673),
-                    },
-                    Field {
-                        label: "Star".to_string(),
-                        ty: DeclarationId(2674),
-                    },
-                    Field {
-                        label: "Slash".to_string(),
-                        ty: DeclarationId(2675),
-                    },
-                    Field {
-                        label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2676),
-                    },
-                    Field {
-                        label: "PipePipe".to_string(),
-                        ty: DeclarationId(2677),
-                    },
-                    Field {
-                        label: "Colon".to_string(),
-                        ty: DeclarationId(2678),
-                    },
-                    Field {
-                        label: "Arrow".to_string(),
-                        ty: DeclarationId(2679),
-                    },
-                    Field {
-                        label: "FatArrow".to_string(),
-                        ty: DeclarationId(2680),
-                    },
-                    Field {
-                        label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2681),
-                    },
-                    Field {
-                        label: "Dot".to_string(),
-                        ty: DeclarationId(2682),
-                    },
-                    Field {
-                        label: "LParen".to_string(),
-                        ty: DeclarationId(2683),
-                    },
-                    Field {
-                        label: "RParen".to_string(),
-                        ty: DeclarationId(2684),
-                    },
-                    Field {
-                        label: "LBrace".to_string(),
-                        ty: DeclarationId(2685),
-                    },
-                    Field {
-                        label: "RBrace".to_string(),
-                        ty: DeclarationId(2686),
-                    },
-                    Field {
-                        label: "LBracket".to_string(),
-                        ty: DeclarationId(2687),
-                    },
-                    Field {
-                        label: "RBracket".to_string(),
-                        ty: DeclarationId(2688),
-                    },
-                    Field {
-                        label: "Comma".to_string(),
-                        ty: DeclarationId(2689),
-                    },
-                    Field {
-                        label: "Semicolon".to_string(),
-                        ty: DeclarationId(2690),
-                    },
-                    Field {
-                        label: "Pipe".to_string(),
-                        ty: DeclarationId(2691),
-                    },
-                    Field {
-                        label: "Question".to_string(),
-                        ty: DeclarationId(2692),
-                    },
-                ],
+            id: DeclarationId(1275),
+            name: Some("report_inhabits_branch_tm".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(1230), DeclarationId(1043)],
+                output: DeclarationId(2688),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(825))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -41564,20 +42231,56 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2347, 2653),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7030, 7281),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1264),
-            name: Some("LocalPunctSpec".to_string()),
+            id: DeclarationId(1276),
+            name: Some("dimension_report_tm_from_witness".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(2689)],
+                output: DeclarationId(2690),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(835))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 7283, 7702),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1277),
+            name: Some("demo_ci_modeled_timing_dimension_report".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(827)],
+                output: DeclarationId(2691),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(843))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 8563, 8864),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1278),
+            name: Some("gate_58_ci_workflow_timing_row".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "pattern".to_string(),
-                        ty: DeclarationId(230),
+                        label: "workflow".to_string(),
+                        ty: DeclarationId(1759),
                     },
                     Field {
-                        label: "kind".to_string(),
-                        ty: DeclarationId(1263),
+                        label: "measurement".to_string(),
+                        ty: DeclarationId(1230),
                     },
                 ],
             },
@@ -41589,35 +42292,124 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2863, 2927),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 10052, 10145),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1265),
-            name: Some("StringEscapeSpec".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "suffix".to_string(),
-                        ty: DeclarationId(230),
+            id: DeclarationId(1279),
+            name: Some("gate_58_modeled_ci_timing_measurement".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1278),
+                arguments: vec![],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(1278)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "workflow".to_string(),
+                        FieldValue::Reference(DeclarationId(1260)),
+                    ),
+                    (
+                        "measurement".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2651),
+                            payload: vec![FieldValue::Record(vec![(
+                                "count".to_string(),
+                                FieldValue::Literal(LiteralBits::Int("0".to_string())),
+                            )])],
+                        },
+                    ),
+                ],
+            }),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 10147, 10316),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1280),
+            name: Some("gate_58_apply_lens_self_application_pass".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1092),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1093),
+                        value: DeclarationId(1230),
                     },
-                    Field {
-                        label: "output_codepoint".to_string(),
-                        ty: DeclarationId(93),
+                    TemplateArgument {
+                        parameter: DeclarationId(1094),
+                        value: DeclarationId(1236),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1095),
+                        value: DeclarationId(1237),
                     },
                 ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(2692)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "enforceable_lens".to_string(),
+                        FieldValue::Reference(DeclarationId(1259)),
+                    ),
+                    (
+                        "section".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2390),
+                            payload: vec![FieldValue::Reference(DeclarationId(1279))],
+                        },
+                    ),
+                    (
+                        "budget".to_string(),
+                        FieldValue::Record(vec![(
+                            "max".to_string(),
+                            FieldValue::Record(vec![(
+                                "count".to_string(),
+                                FieldValue::Literal(LiteralBits::Int("1000000000".to_string())),
+                            )]),
+                        )]),
+                    ),
+                    (
+                        "diagnostic_severity".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2392),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "span".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "file".to_string(),
+                                FieldValue::Literal(LiteralBits::String(
+                                    "src/v3/std/t_ci_workflow_as_data_demo.dag".to_string(),
+                                )),
+                            ),
+                            (
+                                "start".to_string(),
+                                FieldValue::Literal(LiteralBits::Int("0".to_string())),
+                            ),
+                            (
+                                "end".to_string(),
+                                FieldValue::Literal(LiteralBits::Int("0".to_string())),
+                            ),
+                        ]),
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 3314, 3380),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 10576, 10981),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1266),
+            id: DeclarationId(1281),
             name: Some("Path".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(158),
@@ -41634,7 +42426,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1402, 1422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1267),
+            id: DeclarationId(1282),
             name: Some("SnapshotRef".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(151),
@@ -41651,7 +42443,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1423, 1453),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1268),
+            id: DeclarationId(1283),
             name: Some("CensusListConstant".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -41665,15 +42457,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1660, 1686),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1269),
+            id: DeclarationId(1284),
             name: Some("expected_hand_authored_non_test".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1268),
+                template: DeclarationId(1283),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1268)),
+            meta_tag: Some(DeclarationId(1283)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -41682,15 +42474,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1688, 1749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1270),
+            id: DeclarationId(1285),
             name: Some("expected_hand_authored_test".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1268),
+                template: DeclarationId(1283),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1268)),
+            meta_tag: Some(DeclarationId(1283)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -41699,7 +42491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1750, 1807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1271),
+            id: DeclarationId(1286),
             name: Some("LensProducerFilesSubsetPredicate".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -41713,15 +42505,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1939, 1979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1272),
+            id: DeclarationId(1287),
             name: Some("lens_producer_files_subset_predicate".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1271),
+                template: DeclarationId(1286),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1271)),
+            meta_tag: Some(DeclarationId(1286)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -41730,7 +42522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1981, 2061),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1273),
+            id: DeclarationId(1288),
             name: Some("BinShimFilesSubsetPredicate".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -41744,15 +42536,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2168, 2203),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1274),
+            id: DeclarationId(1289),
             name: Some("bin_shim_files_subset_predicate".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1273),
+                template: DeclarationId(1288),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1273)),
+            meta_tag: Some(DeclarationId(1288)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -41761,7 +42553,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2205, 2275),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1275),
+            id: DeclarationId(1290),
             name: Some("CompilerStdPositiveSetRatchet".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -41775,15 +42567,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2354, 2391),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1276),
+            id: DeclarationId(1291),
             name: Some("compiler_std_positive_set_ratchet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1275),
+                template: DeclarationId(1290),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1275)),
+            meta_tag: Some(DeclarationId(1290)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -41792,49 +42584,49 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2393, 2467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1277),
+            id: DeclarationId(1292),
             name: Some("DiagnosticKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(2696),
+                        ty: DeclarationId(2717),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(2697),
+                        ty: DeclarationId(2718),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(2698),
+                        ty: DeclarationId(2719),
                     },
                     Field {
                         label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(2699),
+                        ty: DeclarationId(2720),
                     },
                     Field {
                         label: "ResolveError".to_string(),
-                        ty: DeclarationId(2700),
+                        ty: DeclarationId(2721),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(2701),
+                        ty: DeclarationId(2722),
                     },
                     Field {
                         label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(2702),
+                        ty: DeclarationId(2723),
                     },
                     Field {
                         label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(2703),
+                        ty: DeclarationId(2724),
                     },
                     Field {
                         label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(2704),
+                        ty: DeclarationId(2725),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2705),
+                        ty: DeclarationId(2726),
                     },
                 ],
             },
@@ -41849,17 +42641,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2802, 3033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1278),
+            id: DeclarationId(1293),
             name: Some("DiagnosticDetailExpectation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "AnyDetail".to_string(),
-                        ty: DeclarationId(2706),
+                        ty: DeclarationId(2727),
                     },
                     Field {
                         label: "Contains".to_string(),
-                        ty: DeclarationId(2707),
+                        ty: DeclarationId(2728),
                     },
                 ],
             },
@@ -41874,17 +42666,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3402, 3469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1279),
+            id: DeclarationId(1294),
             name: Some("DiagnosticReference".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(1277),
+                        ty: DeclarationId(1292),
                     },
                     Field {
                         label: "detail_contains".to_string(),
-                        ty: DeclarationId(1278),
+                        ty: DeclarationId(1293),
                     },
                 ],
             },
@@ -41899,17 +42691,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3613, 3711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1280),
+            id: DeclarationId(1295),
             name: Some("PortStateExpectation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(2708),
+                        ty: DeclarationId(2729),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(2709),
+                        ty: DeclarationId(2730),
                     },
                 ],
             },
@@ -41924,12 +42716,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4098, 4151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1281),
+            id: DeclarationId(1296),
             name: Some("PerfBudgetComparisonOp".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "AtMostBudget".to_string(),
-                    ty: DeclarationId(2710),
+                    ty: DeclarationId(2731),
                 }],
             },
             type_params: vec![],
@@ -41943,21 +42735,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4344, 4388),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1282),
+            id: DeclarationId(1297),
             name: Some("AlgebraicLawKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Associativity".to_string(),
-                        ty: DeclarationId(2711),
+                        ty: DeclarationId(2732),
                     },
                     Field {
                         label: "Commutativity".to_string(),
-                        ty: DeclarationId(2712),
+                        ty: DeclarationId(2733),
                     },
                     Field {
                         label: "Identity".to_string(),
-                        ty: DeclarationId(2713),
+                        ty: DeclarationId(2734),
                     },
                 ],
             },
@@ -41972,12 +42764,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5177, 5247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1283),
+            id: DeclarationId(1298),
             name: Some("ProgramGenerator".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "generator".to_string(),
-                    ty: DeclarationId(1316),
+                    ty: DeclarationId(1330),
                 }],
             },
             type_params: vec![],
@@ -41991,12 +42783,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5484, 5537),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1284),
+            id: DeclarationId(1299),
             name: Some("ProgramShape".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LiteralProgram".to_string(),
-                    ty: DeclarationId(2714),
+                    ty: DeclarationId(2735),
                 }],
             },
             type_params: vec![],
@@ -42010,12 +42802,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5770, 5859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1285),
+            id: DeclarationId(1300),
             name: Some("SymbolicCostBindParamExpected".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LinearCostForBindParam".to_string(),
-                    ty: DeclarationId(2715),
+                    ty: DeclarationId(2736),
                 }],
             },
             type_params: vec![],
@@ -42029,12 +42821,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5861, 5953),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1286),
+            id: DeclarationId(1301),
             name: Some("BindParamSizeVariable".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "SelectedBindParamSizeVariable".to_string(),
-                    ty: DeclarationId(2716),
+                    ty: DeclarationId(2737),
                 }],
             },
             type_params: vec![],
@@ -42048,7 +42840,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5955, 6015),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1287),
+            id: DeclarationId(1302),
             name: Some("BindParamRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -42067,17 +42859,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6017, 6051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1288),
+            id: DeclarationId(1303),
             name: Some("LensCapabilityStructuralStatus".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LensCapabilityStructuralTerminal".to_string(),
-                        ty: DeclarationId(2717),
+                        ty: DeclarationId(2738),
                     },
                     Field {
                         label: "LensCapabilityStructuralPartial".to_string(),
-                        ty: DeclarationId(2718),
+                        ty: DeclarationId(2739),
                     },
                 ],
             },
@@ -42092,25 +42884,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6577, 6685),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1289),
+            id: DeclarationId(1304),
             name: Some("LensCapabilityBehavioralStatus".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LensCapabilityBehavioralComplete".to_string(),
-                        ty: DeclarationId(2719),
+                        ty: DeclarationId(2740),
                     },
                     Field {
                         label: "LensCapabilityBehavioralPartial".to_string(),
-                        ty: DeclarationId(2720),
+                        ty: DeclarationId(2741),
                     },
                     Field {
                         label: "LensCapabilityBehavioralStub".to_string(),
-                        ty: DeclarationId(2721),
+                        ty: DeclarationId(2742),
                     },
                     Field {
                         label: "LensCapabilityBehavioralNA".to_string(),
-                        ty: DeclarationId(2722),
+                        ty: DeclarationId(2743),
                     },
                 ],
             },
@@ -42125,21 +42917,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6687, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1290),
+            id: DeclarationId(1305),
             name: Some("LensCapabilityV2Counterpart".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LensCapabilityV2RealV2".to_string(),
-                        ty: DeclarationId(2723),
+                        ty: DeclarationId(2744),
                     },
                     Field {
                         label: "LensCapabilityV2NoneV3Native".to_string(),
-                        ty: DeclarationId(2724),
+                        ty: DeclarationId(2745),
                     },
                     Field {
                         label: "LensCapabilityV2NotApplicable".to_string(),
-                        ty: DeclarationId(2725),
+                        ty: DeclarationId(2746),
                     },
                 ],
             },
@@ -42154,7 +42946,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6861, 6987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1291),
+            id: DeclarationId(1306),
             name: Some("LensCapabilityRegisterRow".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -42164,15 +42956,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "structural".to_string(),
-                        ty: DeclarationId(1288),
+                        ty: DeclarationId(1303),
                     },
                     Field {
                         label: "behavioral".to_string(),
-                        ty: DeclarationId(1289),
+                        ty: DeclarationId(1304),
                     },
                     Field {
                         label: "v2_counterpart".to_string(),
-                        ty: DeclarationId(1290),
+                        ty: DeclarationId(1305),
                     },
                 ],
             },
@@ -42187,18 +42979,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6989, 7183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1292),
+            id: DeclarationId(1307),
             name: Some("lens_capability_register_rows".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1291),
+                    value: DeclarationId(1306),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2765)),
+            meta_tag: Some(DeclarationId(2786)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -42210,21 +43002,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2717),
+                            constructor: DeclarationId(2738),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2719),
+                            constructor: DeclarationId(2740),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2723),
+                            constructor: DeclarationId(2744),
                             payload: vec![],
                         },
                     ),
@@ -42237,21 +43029,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2717),
+                            constructor: DeclarationId(2738),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2719),
+                            constructor: DeclarationId(2740),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2723),
+                            constructor: DeclarationId(2744),
                             payload: vec![],
                         },
                     ),
@@ -42266,21 +43058,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2717),
+                            constructor: DeclarationId(2738),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2722),
+                            constructor: DeclarationId(2743),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2724),
+                            constructor: DeclarationId(2745),
                             payload: vec![],
                         },
                     ),
@@ -42295,21 +43087,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2717),
+                            constructor: DeclarationId(2738),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2720),
+                            constructor: DeclarationId(2741),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2724),
+                            constructor: DeclarationId(2745),
                             payload: vec![],
                         },
                     ),
@@ -42322,21 +43114,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2717),
+                            constructor: DeclarationId(2738),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2719),
+                            constructor: DeclarationId(2740),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2724),
+                            constructor: DeclarationId(2745),
                             payload: vec![],
                         },
                     ),
@@ -42349,21 +43141,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2717),
+                            constructor: DeclarationId(2738),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2720),
+                            constructor: DeclarationId(2741),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2724),
+                            constructor: DeclarationId(2745),
                             payload: vec![],
                         },
                     ),
@@ -42376,21 +43168,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2717),
+                            constructor: DeclarationId(2738),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2719),
+                            constructor: DeclarationId(2740),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2724),
+                            constructor: DeclarationId(2745),
                             payload: vec![],
                         },
                     ),
@@ -42405,21 +43197,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2717),
+                            constructor: DeclarationId(2738),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2719),
+                            constructor: DeclarationId(2740),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2724),
+                            constructor: DeclarationId(2745),
                             payload: vec![],
                         },
                     ),
@@ -42432,21 +43224,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2717),
+                            constructor: DeclarationId(2738),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2719),
+                            constructor: DeclarationId(2740),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2724),
+                            constructor: DeclarationId(2745),
                             payload: vec![],
                         },
                     ),
@@ -42461,21 +43253,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2717),
+                            constructor: DeclarationId(2738),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2719),
+                            constructor: DeclarationId(2740),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2724),
+                            constructor: DeclarationId(2745),
                             payload: vec![],
                         },
                     ),
@@ -42488,21 +43280,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2718),
+                            constructor: DeclarationId(2739),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2722),
+                            constructor: DeclarationId(2743),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2725),
+                            constructor: DeclarationId(2746),
                             payload: vec![],
                         },
                     ),
@@ -42515,21 +43307,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2718),
+                            constructor: DeclarationId(2739),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2722),
+                            constructor: DeclarationId(2743),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2725),
+                            constructor: DeclarationId(2746),
                             payload: vec![],
                         },
                     ),
@@ -42544,21 +43336,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2717),
+                            constructor: DeclarationId(2738),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2722),
+                            constructor: DeclarationId(2743),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2725),
+                            constructor: DeclarationId(2746),
                             payload: vec![],
                         },
                     ),
@@ -42569,113 +43361,113 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 7185, 9772),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1293),
+            id: DeclarationId(1308),
             name: Some("TestPredicate".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Compiles".to_string(),
-                        ty: DeclarationId(2726),
+                        ty: DeclarationId(2747),
                     },
                     Field {
                         label: "FailsWithDiagnostic".to_string(),
-                        ty: DeclarationId(2727),
+                        ty: DeclarationId(2748),
                     },
                     Field {
                         label: "OutputEquals".to_string(),
-                        ty: DeclarationId(2728),
+                        ty: DeclarationId(2749),
                     },
                     Field {
                         label: "PortHasState".to_string(),
-                        ty: DeclarationId(2729),
+                        ty: DeclarationId(2750),
                     },
                     Field {
                         label: "DeclarationHasRefinement".to_string(),
-                        ty: DeclarationId(2730),
+                        ty: DeclarationId(2751),
                     },
                     Field {
                         label: "CostBounded".to_string(),
-                        ty: DeclarationId(2731),
+                        ty: DeclarationId(2752),
                     },
                     Field {
                         label: "BehavioralObservation".to_string(),
-                        ty: DeclarationId(2732),
+                        ty: DeclarationId(2753),
                     },
                     Field {
                         label: "MockBackedInvariant".to_string(),
-                        ty: DeclarationId(2733),
+                        ty: DeclarationId(2754),
                     },
                     Field {
                         label: "ExecuteCommand".to_string(),
-                        ty: DeclarationId(2735),
+                        ty: DeclarationId(2756),
                     },
                     Field {
                         label: "ForAllTargets".to_string(),
-                        ty: DeclarationId(2737),
+                        ty: DeclarationId(2758),
                     },
                     Field {
                         label: "LensOutputEquals".to_string(),
-                        ty: DeclarationId(2738),
+                        ty: DeclarationId(2759),
                     },
                     Field {
                         label: "DifferentialEquals".to_string(),
-                        ty: DeclarationId(2739),
+                        ty: DeclarationId(2760),
                     },
                     Field {
                         label: "SymbolicCostExprEquals".to_string(),
-                        ty: DeclarationId(2740),
+                        ty: DeclarationId(2761),
                     },
                     Field {
                         label: "SymbolicCostExprEqualsForBindParam".to_string(),
-                        ty: DeclarationId(2741),
+                        ty: DeclarationId(2762),
                     },
                     Field {
                         label: "PerfWithinBaseline".to_string(),
-                        ty: DeclarationId(2742),
+                        ty: DeclarationId(2763),
                     },
                     Field {
                         label: "BinaryDimensionReportEquals".to_string(),
-                        ty: DeclarationId(2743),
+                        ty: DeclarationId(2764),
                     },
                     Field {
                         label: "AlgebraicLaw".to_string(),
-                        ty: DeclarationId(2744),
+                        ty: DeclarationId(2765),
                     },
                     Field {
                         label: "CensusBoundCheck".to_string(),
-                        ty: DeclarationId(2745),
+                        ty: DeclarationId(2766),
                     },
                     Field {
                         label: "CensusSubsetCount".to_string(),
-                        ty: DeclarationId(2746),
+                        ty: DeclarationId(2767),
                     },
                     Field {
                         label: "FixedPointConverges".to_string(),
-                        ty: DeclarationId(2747),
+                        ty: DeclarationId(2768),
                     },
                     Field {
                         label: "RatchetZero".to_string(),
-                        ty: DeclarationId(2748),
+                        ty: DeclarationId(2769),
                     },
                     Field {
                         label: "GeneratedFromDag".to_string(),
-                        ty: DeclarationId(2750),
+                        ty: DeclarationId(2771),
                     },
                     Field {
                         label: "CementingDispatchMatchesProjection".to_string(),
-                        ty: DeclarationId(2751),
+                        ty: DeclarationId(2772),
                     },
                     Field {
                         label: "ReleaseDeferredClaim".to_string(),
-                        ty: DeclarationId(2752),
+                        ty: DeclarationId(2773),
                     },
                     Field {
                         label: "SubstrateResearchDeferredClaim".to_string(),
-                        ty: DeclarationId(2753),
+                        ty: DeclarationId(2774),
                     },
                     Field {
                         label: "BridgeLedgerZero".to_string(),
-                        ty: DeclarationId(2754),
+                        ty: DeclarationId(2775),
                     },
                 ],
             },
@@ -42690,7 +43482,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 9774, 22667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1294),
+            id: DeclarationId(1309),
             name: Some("ProgramInput".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -42704,12 +43496,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 22775, 22795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1295),
+            id: DeclarationId(1310),
             name: Some("ProgramOutputBind".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "output_ref".to_string(),
-                    ty: DeclarationId(1316),
+                    ty: DeclarationId(1330),
                 }],
             },
             type_params: vec![],
@@ -42723,7 +43515,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 22938, 22993),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1296),
+            id: DeclarationId(1311),
             name: Some("TestClaim".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -42741,11 +43533,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "predicate".to_string(),
-                        ty: DeclarationId(1293),
+                        ty: DeclarationId(1308),
                     },
                     Field {
                         label: "requires".to_string(),
-                        ty: DeclarationId(2755),
+                        ty: DeclarationId(2776),
                     },
                 ],
             },
@@ -42760,17 +43552,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 23603, 23736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1297),
+            id: DeclarationId(1312),
             name: Some("Quantifier".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ForAll".to_string(),
-                        ty: DeclarationId(2756),
+                        ty: DeclarationId(2777),
                     },
                     Field {
                         label: "Exists".to_string(),
-                        ty: DeclarationId(2757),
+                        ty: DeclarationId(2778),
                     },
                 ],
             },
@@ -42785,7 +43577,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 23917, 23954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1298),
+            id: DeclarationId(1313),
             name: Some("QuantifiedTestClaim".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -42795,19 +43587,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "generator".to_string(),
-                        ty: DeclarationId(1283),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "quantifier".to_string(),
-                        ty: DeclarationId(1297),
+                        ty: DeclarationId(1312),
                     },
                     Field {
                         label: "predicate".to_string(),
-                        ty: DeclarationId(1293),
+                        ty: DeclarationId(1308),
                     },
                     Field {
                         label: "requires".to_string(),
-                        ty: DeclarationId(2758),
+                        ty: DeclarationId(2779),
                     },
                 ],
             },
@@ -42822,17 +43614,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 23956, 24117),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1299),
+            id: DeclarationId(1314),
             name: Some("TestNodeRef".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "EnumeratedTestNode".to_string(),
-                        ty: DeclarationId(2759),
+                        ty: DeclarationId(2780),
                     },
                     Field {
                         label: "QuantifiedTestNode".to_string(),
-                        ty: DeclarationId(2760),
+                        ty: DeclarationId(2781),
                     },
                 ],
             },
@@ -42847,21 +43639,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 25817, 25911),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1300),
+            id: DeclarationId(1315),
             name: Some("TestNodeCostDimension".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "node".to_string(),
-                        ty: DeclarationId(1299),
+                        ty: DeclarationId(1314),
                     },
                     Field {
                         label: "budget".to_string(),
-                        ty: DeclarationId(1244),
+                        ty: DeclarationId(1236),
                     },
                     Field {
                         label: "measured".to_string(),
-                        ty: DeclarationId(1238),
+                        ty: DeclarationId(1230),
                     },
                 ],
             },
@@ -42876,17 +43668,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 25913, 26016),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1301),
+            id: DeclarationId(1316),
             name: Some("SuiteClaim".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Enumerated".to_string(),
-                        ty: DeclarationId(2761),
+                        ty: DeclarationId(2782),
                     },
                     Field {
                         label: "Quantified".to_string(),
-                        ty: DeclarationId(2762),
+                        ty: DeclarationId(2783),
                     },
                 ],
             },
@@ -42901,7 +43693,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 26749, 26826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1302),
+            id: DeclarationId(1317),
             name: Some("TestSuite".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -42911,7 +43703,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "claims".to_string(),
-                        ty: DeclarationId(2763),
+                        ty: DeclarationId(2784),
                     },
                 ],
             },
@@ -42926,7 +43718,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 26828, 26888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1303),
+            id: DeclarationId(1318),
             name: Some("TestObligation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -42936,7 +43728,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "resources".to_string(),
-                        ty: DeclarationId(2764),
+                        ty: DeclarationId(2785),
                     },
                 ],
             },
@@ -42951,11 +43743,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 27086, 27167),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1304),
+            id: DeclarationId(1319),
             name: Some("claim_obligation_resources".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1296)],
-                output: DeclarationId(2693),
+                inputs: vec![DeclarationId(1311)],
+                output: DeclarationId(2714),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     27609,
@@ -42973,11 +43765,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 27538, 27625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1305),
+            id: DeclarationId(1320),
             name: Some("obligation_for_claim".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1296)],
-                output: DeclarationId(1303),
+                inputs: vec![DeclarationId(1311)],
+                output: DeclarationId(1318),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     27683,
@@ -42995,11 +43787,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 27627, 27768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1306),
+            id: DeclarationId(1321),
             name: Some("obligation_for_quantified_claim".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1298)],
-                output: DeclarationId(1303),
+                inputs: vec![DeclarationId(1313)],
+                output: DeclarationId(1318),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     28075,
@@ -43017,12 +43809,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 27998, 28141),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1307),
+            id: DeclarationId(1322),
             name: Some("obligation_for_suite_claim".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1301)],
-                output: DeclarationId(1303),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(813))),
+                inputs: vec![DeclarationId(1316)],
+                output: DeclarationId(1318),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(847))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -43035,11 +43827,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 28446, 28635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1308),
+            id: DeclarationId(1323),
             name: Some("materialize_test_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2694)],
-                output: DeclarationId(2695),
+                inputs: vec![DeclarationId(2715)],
+                output: DeclarationId(2716),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     28719,
@@ -43057,25 +43849,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             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(2766),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(815))),
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/workflows.dag", 963, 1018),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1310),
+            id: DeclarationId(1324),
             name: Some("ValueBehavior".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -43089,7 +43863,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2935, 2956),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1311),
+            id: DeclarationId(1325),
             name: Some("Transform".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -43103,7 +43877,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2957, 2974),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1312),
+            id: DeclarationId(1326),
             name: Some("Branch".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -43117,7 +43891,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2975, 2989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1313),
+            id: DeclarationId(1327),
             name: Some("Loop".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -43131,7 +43905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2990, 3002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1314),
+            id: DeclarationId(1328),
             name: Some("Bind".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -43145,7 +43919,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3003, 3015),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1315),
+            id: DeclarationId(1329),
             name: Some("Main".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -43159,7 +43933,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3016, 3028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1316),
+            id: DeclarationId(1330),
             name: Some("DeclarationRef".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -43173,15 +43947,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3761, 3783),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1317),
+            id: DeclarationId(1331),
             name: Some("go_execution_model".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(957),
+                template: DeclarationId(879),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(957)),
+            meta_tag: Some(DeclarationId(879)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43189,14 +43963,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2246),
+                            constructor: DeclarationId(2118),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2249),
+                            constructor: DeclarationId(2121),
                             payload: vec![],
                         },
                     ),
@@ -43207,22 +43981,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2055, 2157),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1318),
+            id: DeclarationId(1332),
             name: Some("go_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(959),
+                template: DeclarationId(881),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(959)),
+            meta_tag: Some(DeclarationId(881)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "internal".to_string(),
-                        FieldValue::Reference(DeclarationId(960)),
+                        FieldValue::Reference(DeclarationId(882)),
                     ),
                     (
                         "additional_excluded_prefixes".to_string(),
@@ -43237,15 +44011,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2159, 2309),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1319),
+            id: DeclarationId(1333),
             name: Some("go_execution_requirement".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(961),
+                template: DeclarationId(883),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(961)),
+            meta_tag: Some(DeclarationId(883)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -43258,22 +44032,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2311, 2386),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1320),
+            id: DeclarationId(1334),
             name: Some("go_int".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -43299,22 +44073,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2388, 2518),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1321),
+            id: DeclarationId(1335),
             name: Some("go_int32".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -43340,22 +44114,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2520, 2654),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1322),
+            id: DeclarationId(1336),
             name: Some("go_integer_inhabit_i32_at_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1017),
+                template: DeclarationId(974),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1017)),
+            meta_tag: Some(DeclarationId(974)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -43368,17 +44142,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2327),
+                            constructor: DeclarationId(2258),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1914),
+                                constructor: DeclarationId(1928),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(
                                         "-2147483648".to_string(),
                                     )),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1913),
+                                        constructor: DeclarationId(1927),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1911),
+                                            constructor: DeclarationId(1925),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -43390,7 +44164,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1321)),
+                        FieldValue::Reference(DeclarationId(1335)),
                     ),
                 ],
             }),
@@ -43399,22 +44173,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2656, 2959),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1323),
+            id: DeclarationId(1337),
             name: Some("go_integer_inhabit_int_platform_dependent".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1017),
+                template: DeclarationId(974),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1017)),
+            meta_tag: Some(DeclarationId(974)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -43427,13 +44201,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2328),
+                            constructor: DeclarationId(2259),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1320)),
+                        FieldValue::Reference(DeclarationId(1334)),
                     ),
                 ],
             }),
@@ -43442,22 +44216,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 3397, 3598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1324),
+            id: DeclarationId(1338),
             name: Some("go_bool".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -43483,22 +44257,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 3600, 3731),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1325),
+            id: DeclarationId(1339),
             name: Some("go_string".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -43524,22 +44298,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 3733, 3870),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1326),
+            id: DeclarationId(1340),
             name: Some("go_node_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -43565,22 +44339,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 3872, 4010),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1327),
+            id: DeclarationId(1341),
             name: Some("go_port_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -43606,22 +44380,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 4012, 4150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1328),
+            id: DeclarationId(1342),
             name: Some("go_declaration_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -43647,22 +44421,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 4152, 4311),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1329),
+            id: DeclarationId(1343),
             name: Some("go_cluster_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -43688,22 +44462,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 4313, 4460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1330),
+            id: DeclarationId(1344),
             name: Some("go_type_shape".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -43727,7 +44501,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2329),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -43750,22 +44524,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 4462, 4703),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1331),
+            id: DeclarationId(1345),
             name: Some("go_port_state".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -43791,22 +44565,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 4705, 4853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1332),
+            id: DeclarationId(1346),
             name: Some("go_port".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -43831,7 +44605,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -43850,7 +44624,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state".to_string(),
                                         ))],
@@ -43871,7 +44645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -43895,22 +44669,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 4855, 5238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1333),
+            id: DeclarationId(1347),
             name: Some("go_source_span".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -43935,7 +44709,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -43954,7 +44728,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -43973,7 +44747,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -43997,22 +44771,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 5240, 5634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1334),
+            id: DeclarationId(1348),
             name: Some("go_literal_bits".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -44038,22 +44812,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 5636, 5790),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1335),
+            id: DeclarationId(1349),
             name: Some("go_atom_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -44079,22 +44853,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 5792, 5946),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1336),
+            id: DeclarationId(1350),
             name: Some("go_cardinality_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -44120,22 +44894,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 5948, 6117),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1337),
+            id: DeclarationId(1351),
             name: Some("go_interval".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -44161,22 +44935,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 6119, 6263),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1338),
+            id: DeclarationId(1352),
             name: Some("go_positive_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -44204,22 +44978,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 6265, 6450),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1339),
+            id: DeclarationId(1353),
             name: Some("go_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -44245,22 +45019,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 6452, 6612),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1340),
+            id: DeclarationId(1354),
             name: Some("go_conj_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -44285,7 +45059,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -44304,7 +45078,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -44328,22 +45102,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 6614, 6916),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1341),
+            id: DeclarationId(1355),
             name: Some("go_template_argument".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -44370,7 +45144,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -44389,7 +45163,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -44413,22 +45187,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 6918, 7255),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1342),
+            id: DeclarationId(1356),
             name: Some("go_phantom_parameter".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -44455,7 +45229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -44474,7 +45248,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -44498,22 +45272,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 7257, 7598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1343),
+            id: DeclarationId(1357),
             name: Some("go_nominal_opacity".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -44539,7 +45313,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2329),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -44562,22 +45336,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 7600, 7872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1344),
+            id: DeclarationId(1358),
             name: Some("go_field_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -44602,7 +45376,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -44621,7 +45395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -44645,22 +45419,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 7874, 8185),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1345),
+            id: DeclarationId(1359),
             name: Some("go_non_empty_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -44685,7 +45459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -44704,7 +45478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -44728,22 +45502,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 8187, 8503),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1346),
+            id: DeclarationId(1360),
             name: Some("go_non_singleton_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -44768,7 +45542,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -44787,7 +45561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -44806,7 +45580,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -44830,22 +45604,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 8505, 8914),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1347),
+            id: DeclarationId(1361),
             name: Some("go_param_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -44870,7 +45644,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
+                                        constructor: DeclarationId(2261),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -44889,7 +45663,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
+                                        constructor: DeclarationId(2261),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -44913,22 +45687,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 8916, 9232),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1348),
+            id: DeclarationId(1362),
             name: Some("go_transform_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -44952,7 +45726,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2330),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -44975,22 +45749,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 9234, 9475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1349),
+            id: DeclarationId(1363),
             name: Some("go_member_descent".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -45014,7 +45788,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2329),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -45037,22 +45811,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 9477, 9718),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1350),
+            id: DeclarationId(1364),
             name: Some("go_intra_cluster_call".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -45076,7 +45850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2329),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -45099,22 +45873,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 9720, 9979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1351),
+            id: DeclarationId(1365),
             name: Some("go_cluster".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -45139,7 +45913,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -45160,7 +45934,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -45184,22 +45958,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 9981, 10314),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1352),
+            id: DeclarationId(1366),
             name: Some("go_field_value".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -45225,22 +45999,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 10316, 10467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1353),
+            id: DeclarationId(1367),
             name: Some("go_value_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -45266,22 +46040,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 10469, 10617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1354),
+            id: DeclarationId(1368),
             name: Some("go_arrow_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -45307,22 +46081,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 10619, 10767),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1355),
+            id: DeclarationId(1369),
             name: Some("go_type_connective".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -45348,22 +46122,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 10769, 10932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1356),
+            id: DeclarationId(1370),
             name: Some("go_declaration".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -45388,7 +46162,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -45407,7 +46181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -45428,7 +46202,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -45449,7 +46223,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -45470,7 +46244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -45491,7 +46265,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -45512,7 +46286,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -45533,7 +46307,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -45554,7 +46328,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -45573,7 +46347,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -45597,22 +46371,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 10934, 11951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1357),
+            id: DeclarationId(1371),
             name: Some("go_arithmetic_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -45638,22 +46412,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 11953, 12110),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1358),
+            id: DeclarationId(1372),
             name: Some("go_comparison_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -45679,22 +46453,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 12112, 12269),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1359),
+            id: DeclarationId(1373),
             name: Some("go_logical_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -45720,22 +46494,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 12271, 12419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1360),
+            id: DeclarationId(1374),
             name: Some("go_operator_kind".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -45761,22 +46535,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 12421, 12578),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1361),
+            id: DeclarationId(1375),
             name: Some("go_transform_target".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -45802,22 +46576,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 12580, 12746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1362),
+            id: DeclarationId(1376),
             name: Some("go_branch_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -45843,22 +46617,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 12748, 12908),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1363),
+            id: DeclarationId(1377),
             name: Some("go_payload_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -45885,7 +46659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -45906,7 +46680,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -45930,22 +46704,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 12910, 13261),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1364),
+            id: DeclarationId(1378),
             name: Some("go_branch_path".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -45970,7 +46744,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -45991,7 +46765,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -46010,7 +46784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -46029,7 +46803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -46053,22 +46827,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 13263, 13750),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1365),
+            id: DeclarationId(1379),
             name: Some("go_loop_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -46094,22 +46868,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 13752, 13900),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1366),
+            id: DeclarationId(1380),
             name: Some("go_value_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -46134,7 +46908,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -46153,7 +46927,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -46174,7 +46948,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -46193,7 +46967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46217,22 +46991,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 14374, 14848),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1367),
+            id: DeclarationId(1381),
             name: Some("go_transform_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -46257,7 +47031,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -46276,7 +47050,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -46295,7 +47069,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -46316,7 +47090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -46335,7 +47109,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46359,22 +47133,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 14850, 15415),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1368),
+            id: DeclarationId(1382),
             name: Some("go_branch_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -46399,7 +47173,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -46418,7 +47192,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -46437,7 +47211,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -46458,7 +47232,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -46477,7 +47251,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46498,7 +47272,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -46522,22 +47296,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 15417, 16074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1369),
+            id: DeclarationId(1383),
             name: Some("go_loop_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -46562,7 +47336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -46581,7 +47355,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -46600,7 +47374,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -46619,7 +47393,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -46638,7 +47412,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -46659,7 +47433,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -46678,7 +47452,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46702,22 +47476,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 16076, 16778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1370),
+            id: DeclarationId(1384),
             name: Some("go_bind_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -46742,7 +47516,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -46761,7 +47535,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -46782,7 +47556,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -46801,7 +47575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -46820,7 +47594,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46841,7 +47615,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -46865,22 +47639,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 16780, 17431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1371),
+            id: DeclarationId(1385),
             name: Some("go_behavior".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -46906,22 +47680,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 17433, 17577),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1372),
+            id: DeclarationId(1386),
             name: Some("go_dag".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -46948,7 +47722,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -46967,7 +47741,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -46986,7 +47760,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -47007,7 +47781,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -47031,26 +47805,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 17579, 18046),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1373),
+            id: DeclarationId(1387),
             name: Some("go_surface_module".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1148)),
+                        FieldValue::Reference(DeclarationId(1099)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47070,7 +47844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2329),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -47093,26 +47867,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 18349, 18590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1374),
+            id: DeclarationId(1388),
             name: Some("go_surface_item".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1162)),
+                        FieldValue::Reference(DeclarationId(1113)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47134,26 +47908,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 18592, 18746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1375),
+            id: DeclarationId(1389),
             name: Some("go_surface_param".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1149)),
+                        FieldValue::Reference(DeclarationId(1100)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47174,7 +47948,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -47193,7 +47967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -47214,7 +47988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -47238,26 +48012,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 18748, 19146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1376),
+            id: DeclarationId(1390),
             name: Some("go_surface_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1150)),
+                        FieldValue::Reference(DeclarationId(1101)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47278,7 +48052,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -47297,7 +48071,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -47321,26 +48095,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 19148, 19457),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1377),
+            id: DeclarationId(1391),
             name: Some("go_surface_variant".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1151)),
+                        FieldValue::Reference(DeclarationId(1102)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47361,7 +48135,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -47380,7 +48154,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -47399,7 +48173,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -47423,26 +48197,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 19459, 19861),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1378),
+            id: DeclarationId(1392),
             name: Some("go_variant_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1152)),
+                        FieldValue::Reference(DeclarationId(1103)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47464,26 +48238,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 19863, 20026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1379),
+            id: DeclarationId(1393),
             name: Some("go_surface_type".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1154)),
+                        FieldValue::Reference(DeclarationId(1105)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47505,26 +48279,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 20028, 20182),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1380),
+            id: DeclarationId(1394),
             name: Some("go_surface_record_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1155)),
+                        FieldValue::Reference(DeclarationId(1106)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47545,7 +48319,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -47564,7 +48338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -47583,7 +48357,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -47607,26 +48381,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 20184, 20595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1381),
+            id: DeclarationId(1395),
             name: Some("go_surface_map_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1156)),
+                        FieldValue::Reference(DeclarationId(1107)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47647,7 +48421,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -47668,7 +48442,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -47687,7 +48461,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -47706,7 +48480,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -47730,26 +48504,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 20597, 21082),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1382),
+            id: DeclarationId(1396),
             name: Some("go_surface_match_arm".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1157)),
+                        FieldValue::Reference(DeclarationId(1108)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47770,7 +48544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -47789,7 +48563,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -47808,7 +48582,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -47832,26 +48606,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 21084, 21490),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1383),
+            id: DeclarationId(1397),
             name: Some("go_surface_pattern_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1158)),
+                        FieldValue::Reference(DeclarationId(1109)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47872,7 +48646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -47891,7 +48665,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -47910,7 +48684,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -47934,26 +48708,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 21492, 21910),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1384),
+            id: DeclarationId(1398),
             name: Some("go_surface_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1159)),
+                        FieldValue::Reference(DeclarationId(1110)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47975,26 +48749,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 21912, 22075),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1385),
+            id: DeclarationId(1399),
             name: Some("go_surface_literal".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1160)),
+                        FieldValue::Reference(DeclarationId(1111)),
                     ),
                     (
                         "carrier".to_string(),
@@ -48016,26 +48790,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22077, 22240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1386),
+            id: DeclarationId(1400),
             name: Some("go_surface_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1161)),
+                        FieldValue::Reference(DeclarationId(1112)),
                     ),
                     (
                         "carrier".to_string(),
@@ -48057,22 +48831,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22242, 22396),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1387),
+            id: DeclarationId(1401),
             name: Some("go_int_add".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -48094,22 +48868,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22398, 22539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1388),
+            id: DeclarationId(1402),
             name: Some("go_int_sub".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -48131,22 +48905,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22541, 22682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1389),
+            id: DeclarationId(1403),
             name: Some("go_int_mul".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -48168,22 +48942,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22684, 22825),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1390),
+            id: DeclarationId(1404),
             name: Some("go_int_div".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -48207,22 +48981,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22827, 22975),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1391),
+            id: DeclarationId(1405),
             name: Some("go_int_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -48244,22 +49018,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22977, 23117),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1392),
+            id: DeclarationId(1406),
             name: Some("go_node_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -48281,22 +49055,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23119, 23266),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1393),
+            id: DeclarationId(1407),
             name: Some("go_port_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -48318,22 +49092,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23268, 23415),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1394),
+            id: DeclarationId(1408),
             name: Some("go_declaration_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -48355,22 +49129,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23417, 23578),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1395),
+            id: DeclarationId(1409),
             name: Some("go_int_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -48392,22 +49166,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23580, 23720),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1396),
+            id: DeclarationId(1410),
             name: Some("go_node_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -48429,22 +49203,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23722, 23869),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1397),
+            id: DeclarationId(1411),
             name: Some("go_port_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -48466,22 +49240,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23871, 24018),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1398),
+            id: DeclarationId(1412),
             name: Some("go_declaration_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -48503,22 +49277,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24020, 24181),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1399),
+            id: DeclarationId(1413),
             name: Some("go_int_lt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -48540,22 +49314,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24183, 24322),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1400),
+            id: DeclarationId(1414),
             name: Some("go_int_le".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -48577,22 +49351,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24324, 24464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1401),
+            id: DeclarationId(1415),
             name: Some("go_int_gt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -48614,22 +49388,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24466, 24605),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1402),
+            id: DeclarationId(1416),
             name: Some("go_int_ge".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -48651,22 +49425,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24607, 24747),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1403),
+            id: DeclarationId(1417),
             name: Some("go_bool_meet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -48688,22 +49462,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24749, 24898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1404),
+            id: DeclarationId(1418),
             name: Some("go_bool_join".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -48725,26 +49499,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24900, 25049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1405),
+            id: DeclarationId(1419),
             name: Some("go_let_stmt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(979),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(979)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1314)),
+                        FieldValue::Reference(DeclarationId(1328)),
                     ),
                     (
                         "carrier".to_string(),
@@ -48763,26 +49537,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 25051, 25184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1406),
+            id: DeclarationId(1420),
             name: Some("go_if_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(979),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(979)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1312)),
+                        FieldValue::Reference(DeclarationId(1326)),
                     ),
                     (
                         "carrier".to_string(),
@@ -48801,26 +49575,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 25186, 25329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1407),
+            id: DeclarationId(1421),
             name: Some("go_main_wrap".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(979),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(979)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1315)),
+                        FieldValue::Reference(DeclarationId(1329)),
                     ),
                     (
                         "carrier".to_string(),
@@ -48839,22 +49613,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 25331, 25484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1408),
+            id: DeclarationId(1422),
             name: Some("go_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -48863,7 +49637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2342),
+                            constructor: DeclarationId(2273),
                             payload: vec![],
                         },
                     ),
@@ -48879,22 +49653,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 25486, 25624),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1409),
+            id: DeclarationId(1423),
             name: Some("go_singleton_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -48903,7 +49677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2343),
+                            constructor: DeclarationId(2274),
                             payload: vec![],
                         },
                     ),
@@ -48917,7 +49691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2333),
+                                    constructor: DeclarationId(2264),
                                     payload: vec![],
                                 },
                             ),
@@ -48934,22 +49708,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 25626, 25818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1410),
+            id: DeclarationId(1424),
             name: Some("go_cons_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -48958,7 +49732,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2344),
+                            constructor: DeclarationId(2275),
                             payload: vec![],
                         },
                     ),
@@ -48973,7 +49747,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2333),
+                                        constructor: DeclarationId(2264),
                                         payload: vec![],
                                     },
                                 ),
@@ -48986,7 +49760,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2333),
+                                        constructor: DeclarationId(2264),
                                         payload: vec![],
                                     },
                                 ),
@@ -49004,22 +49778,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 25820, 26037),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1411),
+            id: DeclarationId(1425),
             name: Some("go_concat_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -49028,7 +49802,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2345),
+                            constructor: DeclarationId(2276),
                             payload: vec![],
                         },
                     ),
@@ -49043,7 +49817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2333),
+                                        constructor: DeclarationId(2264),
                                         payload: vec![],
                                     },
                                 ),
@@ -49056,7 +49830,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2333),
+                                        constructor: DeclarationId(2264),
                                         payload: vec![],
                                     },
                                 ),
@@ -49074,22 +49848,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 26039, 26262),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1412),
+            id: DeclarationId(1426),
             name: Some("go_length_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -49098,7 +49872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2346),
+                            constructor: DeclarationId(2277),
                             payload: vec![],
                         },
                     ),
@@ -49112,7 +49886,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2332),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -49129,22 +49903,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 26264, 26447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1413),
+            id: DeclarationId(1427),
             name: Some("go_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1031),
+                template: DeclarationId(988),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1031)),
+            meta_tag: Some(DeclarationId(988)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -49165,22 +49939,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 26449, 26585),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1414),
+            id: DeclarationId(1428),
             name: Some("go_result_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1031),
+                template: DeclarationId(988),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1031)),
+            meta_tag: Some(DeclarationId(988)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -49203,22 +49977,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 27271, 27424),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1415),
+            id: DeclarationId(1429),
             name: Some("go_map_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1031),
+                template: DeclarationId(988),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1031)),
+            meta_tag: Some(DeclarationId(988)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -49239,22 +50013,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 27426, 27566),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1416),
+            id: DeclarationId(1430),
             name: Some("go_is_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -49263,7 +50037,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2347),
+                            constructor: DeclarationId(2278),
                             payload: vec![],
                         },
                     ),
@@ -49277,7 +50051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2332),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -49294,22 +50068,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 27568, 27756),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1417),
+            id: DeclarationId(1431),
             name: Some("go_fold_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -49318,7 +50092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2348),
+                            constructor: DeclarationId(2279),
                             payload: vec![],
                         },
                     ),
@@ -49333,7 +50107,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2263),
                                         payload: vec![],
                                     },
                                 ),
@@ -49346,7 +50120,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2333),
+                                        constructor: DeclarationId(2264),
                                         payload: vec![],
                                     },
                                 ),
@@ -49359,7 +50133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2263),
                                         payload: vec![],
                                     },
                                 ),
@@ -49377,22 +50151,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 27758, 28015),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1418),
+            id: DeclarationId(1432),
             name: Some("go_map_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -49401,7 +50175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2349),
+                            constructor: DeclarationId(2280),
                             payload: vec![],
                         },
                     ),
@@ -49416,7 +50190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2263),
                                         payload: vec![],
                                     },
                                 ),
@@ -49429,7 +50203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2263),
                                         payload: vec![],
                                     },
                                 ),
@@ -49447,22 +50221,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 28017, 28231),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1419),
+            id: DeclarationId(1433),
             name: Some("go_filter_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -49471,7 +50245,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2350),
+                            constructor: DeclarationId(2281),
                             payload: vec![],
                         },
                     ),
@@ -49486,7 +50260,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2263),
                                         payload: vec![],
                                     },
                                 ),
@@ -49499,7 +50273,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2263),
                                         payload: vec![],
                                     },
                                 ),
@@ -49517,22 +50291,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 28233, 28456),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1420),
+            id: DeclarationId(1434),
             name: Some("go_contains_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -49541,7 +50315,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2351),
+                            constructor: DeclarationId(2282),
                             payload: vec![],
                         },
                     ),
@@ -49556,7 +50330,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2263),
                                         payload: vec![],
                                     },
                                 ),
@@ -49569,7 +50343,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2263),
                                         payload: vec![],
                                     },
                                 ),
@@ -49587,22 +50361,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 28458, 28687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1421),
+            id: DeclarationId(1435),
             name: Some("go_list_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1033),
+                template: DeclarationId(990),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1033)),
+            meta_tag: Some(DeclarationId(990)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "target".to_string(),
@@ -49611,17 +50385,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2284),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1819)),
+                        FieldValue::Reference(DeclarationId(1833)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1821)),
+                        FieldValue::Reference(DeclarationId(1835)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -49654,15 +50428,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 28774, 29080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1422),
+            id: DeclarationId(1436),
             name: Some("go_statements".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1035),
+                template: DeclarationId(992),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1035)),
+            meta_tag: Some(DeclarationId(992)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -49684,15 +50458,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 29082, 29212),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1423),
+            id: DeclarationId(1437),
             name: Some("go_expressions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1036),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1036)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -49718,15 +50492,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 29214, 29374),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1424),
+            id: DeclarationId(1438),
             name: Some("go_control_flow".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1038),
+                template: DeclarationId(995),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1038)),
+            meta_tag: Some(DeclarationId(995)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -49763,15 +50537,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 29376, 29577),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1425),
+            id: DeclarationId(1439),
             name: Some("go_literals".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1039),
+                template: DeclarationId(996),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1039)),
+            meta_tag: Some(DeclarationId(996)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -49795,15 +50569,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 29579, 29689),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1426),
+            id: DeclarationId(1440),
             name: Some("go_modules".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1040),
+                template: DeclarationId(997),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1040)),
+            meta_tag: Some(DeclarationId(997)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -49817,15 +50591,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 29691, 29748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1427),
+            id: DeclarationId(1441),
             name: Some("go_functions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1041),
+                template: DeclarationId(998),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1041)),
+            meta_tag: Some(DeclarationId(998)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -49863,15 +50637,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 29750, 30035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1428),
+            id: DeclarationId(1442),
             name: Some("go_type_applications".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1042),
+                template: DeclarationId(999),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1042)),
+            meta_tag: Some(DeclarationId(999)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -49885,15 +50659,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 30037, 30116),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1429),
+            id: DeclarationId(1443),
             name: Some("go_type_defs".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1043),
+                template: DeclarationId(1000),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1043)),
+            meta_tag: Some(DeclarationId(1000)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -49929,15 +50703,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 30118, 30341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1430),
+            id: DeclarationId(1444),
             name: Some("go_patterns".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1045),
+                template: DeclarationId(1002),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1045)),
+            meta_tag: Some(DeclarationId(1002)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -49983,54 +50757,54 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 30343, 30635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1431),
+            id: DeclarationId(1445),
             name: Some("go_collection_ops".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1046),
+                template: DeclarationId(1003),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1046)),
+            meta_tag: Some(DeclarationId(1003)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "concat_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1058)),
+                        FieldValue::Reference(DeclarationId(1070)),
                     ),
                     (
                         "length_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1059)),
+                        FieldValue::Reference(DeclarationId(1071)),
                     ),
                     (
                         "is_empty_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1060)),
+                        FieldValue::Reference(DeclarationId(1072)),
                     ),
                     (
                         "fold_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1061)),
+                        FieldValue::Reference(DeclarationId(1073)),
                     ),
                     (
                         "filter_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1063)),
+                        FieldValue::Reference(DeclarationId(1075)),
                     ),
                     (
                         "flat_map_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1066)),
+                        FieldValue::Reference(DeclarationId(1078)),
                     ),
                     (
                         "any_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1064)),
+                        FieldValue::Reference(DeclarationId(1076)),
                     ),
                     (
                         "all_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1065)),
+                        FieldValue::Reference(DeclarationId(1077)),
                     ),
                     (
                         "map_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1062)),
+                        FieldValue::Reference(DeclarationId(1074)),
                     ),
                     (
                         "filter".to_string(),
@@ -50067,15 +50841,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 30637, 31402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1432),
+            id: DeclarationId(1446),
             name: Some("go_value_construction".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1047),
+                template: DeclarationId(1004),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1047)),
+            meta_tag: Some(DeclarationId(1004)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -50111,15 +50885,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 31404, 31672),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1433),
+            id: DeclarationId(1447),
             name: Some("go_record_derive_templates".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1044),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1044)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -50139,66 +50913,66 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 32429, 32544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1434),
+            id: DeclarationId(1448),
             name: Some("go_language".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1051),
+                template: DeclarationId(1008),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1051)),
+            meta_tag: Some(DeclarationId(1008)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "statements".to_string(),
-                        FieldValue::Reference(DeclarationId(1422)),
+                        FieldValue::Reference(DeclarationId(1436)),
                     ),
                     (
                         "expressions".to_string(),
-                        FieldValue::Reference(DeclarationId(1423)),
+                        FieldValue::Reference(DeclarationId(1437)),
                     ),
                     (
                         "control_flow".to_string(),
-                        FieldValue::Reference(DeclarationId(1424)),
+                        FieldValue::Reference(DeclarationId(1438)),
                     ),
                     (
                         "literals".to_string(),
-                        FieldValue::Reference(DeclarationId(1425)),
+                        FieldValue::Reference(DeclarationId(1439)),
                     ),
                     (
                         "modules".to_string(),
-                        FieldValue::Reference(DeclarationId(1426)),
+                        FieldValue::Reference(DeclarationId(1440)),
                     ),
                     (
                         "functions".to_string(),
-                        FieldValue::Reference(DeclarationId(1427)),
+                        FieldValue::Reference(DeclarationId(1441)),
                     ),
                     (
                         "type_applications".to_string(),
-                        FieldValue::Reference(DeclarationId(1428)),
+                        FieldValue::Reference(DeclarationId(1442)),
                     ),
                     (
                         "type_definitions".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1443)),
                     ),
                     (
                         "record_derive_templates".to_string(),
-                        FieldValue::Reference(DeclarationId(1433)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "patterns".to_string(),
-                        FieldValue::Reference(DeclarationId(1430)),
+                        FieldValue::Reference(DeclarationId(1444)),
                     ),
                     (
                         "collection_ops".to_string(),
-                        FieldValue::Reference(DeclarationId(1431)),
+                        FieldValue::Reference(DeclarationId(1445)),
                     ),
                     (
                         "values".to_string(),
-                        FieldValue::Reference(DeclarationId(1432)),
+                        FieldValue::Reference(DeclarationId(1446)),
                     ),
                 ],
             }),
@@ -50207,15 +50981,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 32546, 32965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1435),
+            id: DeclarationId(1449),
             name: Some("go_correction_style".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(930),
+                template: DeclarationId(1021),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(930)),
+            meta_tag: Some(DeclarationId(1021)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -50243,15 +51017,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 34632, 34768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1436),
+            id: DeclarationId(1450),
             name: Some("go_clean_emission".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(921),
+                template: DeclarationId(1012),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(921)),
+            meta_tag: Some(DeclarationId(1012)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -50259,55 +51033,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2180),
+                            constructor: DeclarationId(2294),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2183),
+                            constructor: DeclarationId(2297),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2186),
+                            constructor: DeclarationId(2300),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2189),
+                            constructor: DeclarationId(2303),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2193),
+                            constructor: DeclarationId(2307),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2195),
+                            constructor: DeclarationId(2309),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2199),
+                            constructor: DeclarationId(2313),
                             payload: vec![],
                         },
                     ),
                     (
                         "correction_style".to_string(),
-                        FieldValue::Reference(DeclarationId(1435)),
+                        FieldValue::Reference(DeclarationId(1449)),
                     ),
                     (
                         "post_emit_verifier".to_string(),
@@ -50333,7 +51107,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2202),
+                                    constructor: DeclarationId(2316),
                                     payload: vec![],
                                 },
                             ),
@@ -50346,26 +51120,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 34770, 35328),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1437),
+            id: DeclarationId(1451),
             name: Some("go_clean_emission_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(922),
+                template: DeclarationId(1013),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(922)),
+            meta_tag: Some(DeclarationId(1013)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "clean_emission".to_string(),
-                        FieldValue::Reference(DeclarationId(1436)),
+                        FieldValue::Reference(DeclarationId(1450)),
                     ),
                 ],
             }),
@@ -50374,15 +51148,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 35330, 35454),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1438),
+            id: DeclarationId(1452),
             name: Some("python_statements".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1035),
+                template: DeclarationId(992),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1035)),
+            meta_tag: Some(DeclarationId(992)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -50402,15 +51176,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 2347, 2469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1439),
+            id: DeclarationId(1453),
             name: Some("python_expressions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1036),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1036)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -50436,15 +51210,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 2471, 2624),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1440),
+            id: DeclarationId(1454),
             name: Some("python_control_flow".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1038),
+                template: DeclarationId(995),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1038)),
+            meta_tag: Some(DeclarationId(995)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -50481,15 +51255,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 2626, 2841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1441),
+            id: DeclarationId(1455),
             name: Some("python_literals".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1039),
+                template: DeclarationId(996),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1039)),
+            meta_tag: Some(DeclarationId(996)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -50513,15 +51287,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 2843, 2957),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1442),
+            id: DeclarationId(1456),
             name: Some("python_modules".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1040),
+                template: DeclarationId(997),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1040)),
+            meta_tag: Some(DeclarationId(997)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -50535,15 +51309,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 2959, 3020),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1443),
+            id: DeclarationId(1457),
             name: Some("python_functions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1041),
+                template: DeclarationId(998),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1041)),
+            meta_tag: Some(DeclarationId(998)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -50581,15 +51355,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 3022, 3329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1444),
+            id: DeclarationId(1458),
             name: Some("python_type_applications".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1042),
+                template: DeclarationId(999),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1042)),
+            meta_tag: Some(DeclarationId(999)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -50605,15 +51379,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 3331, 3430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1445),
+            id: DeclarationId(1459),
             name: Some("python_type_definitions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1043),
+                template: DeclarationId(1000),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1043)),
+            meta_tag: Some(DeclarationId(1000)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -50653,15 +51427,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 3432, 3763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1446),
+            id: DeclarationId(1460),
             name: Some("python_patterns".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1045),
+                template: DeclarationId(1002),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1045)),
+            meta_tag: Some(DeclarationId(1002)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -50707,54 +51481,54 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 3765, 4095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1447),
+            id: DeclarationId(1461),
             name: Some("python_collections".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1046),
+                template: DeclarationId(1003),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1046)),
+            meta_tag: Some(DeclarationId(1003)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "concat_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1163)),
+                        FieldValue::Reference(DeclarationId(1114)),
                     ),
                     (
                         "length_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1164)),
+                        FieldValue::Reference(DeclarationId(1115)),
                     ),
                     (
                         "is_empty_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1165)),
+                        FieldValue::Reference(DeclarationId(1116)),
                     ),
                     (
                         "fold_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1166)),
+                        FieldValue::Reference(DeclarationId(1117)),
                     ),
                     (
                         "filter_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1168)),
+                        FieldValue::Reference(DeclarationId(1119)),
                     ),
                     (
                         "flat_map_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1171)),
+                        FieldValue::Reference(DeclarationId(1122)),
                     ),
                     (
                         "any_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1169)),
+                        FieldValue::Reference(DeclarationId(1120)),
                     ),
                     (
                         "all_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1170)),
+                        FieldValue::Reference(DeclarationId(1121)),
                     ),
                     (
                         "map_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1167)),
+                        FieldValue::Reference(DeclarationId(1118)),
                     ),
                     (
                         "filter".to_string(),
@@ -50785,15 +51559,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 4097, 4861),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1448),
+            id: DeclarationId(1462),
             name: Some("python_value_construction".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1047),
+                template: DeclarationId(1004),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1047)),
+            meta_tag: Some(DeclarationId(1004)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -50825,15 +51599,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 4863, 5115),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1449),
+            id: DeclarationId(1463),
             name: Some("python_record_derive_templates".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1044),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1044)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -50853,66 +51627,66 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 5318, 5437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1450),
+            id: DeclarationId(1464),
             name: Some("python_language".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1051),
+                template: DeclarationId(1008),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1051)),
+            meta_tag: Some(DeclarationId(1008)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "statements".to_string(),
-                        FieldValue::Reference(DeclarationId(1438)),
+                        FieldValue::Reference(DeclarationId(1452)),
                     ),
                     (
                         "expressions".to_string(),
-                        FieldValue::Reference(DeclarationId(1439)),
+                        FieldValue::Reference(DeclarationId(1453)),
                     ),
                     (
                         "control_flow".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1454)),
                     ),
                     (
                         "literals".to_string(),
-                        FieldValue::Reference(DeclarationId(1441)),
+                        FieldValue::Reference(DeclarationId(1455)),
                     ),
                     (
                         "modules".to_string(),
-                        FieldValue::Reference(DeclarationId(1442)),
+                        FieldValue::Reference(DeclarationId(1456)),
                     ),
                     (
                         "functions".to_string(),
-                        FieldValue::Reference(DeclarationId(1443)),
+                        FieldValue::Reference(DeclarationId(1457)),
                     ),
                     (
                         "type_applications".to_string(),
-                        FieldValue::Reference(DeclarationId(1444)),
+                        FieldValue::Reference(DeclarationId(1458)),
                     ),
                     (
                         "type_definitions".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1459)),
                     ),
                     (
                         "record_derive_templates".to_string(),
-                        FieldValue::Reference(DeclarationId(1449)),
+                        FieldValue::Reference(DeclarationId(1463)),
                     ),
                     (
                         "patterns".to_string(),
-                        FieldValue::Reference(DeclarationId(1446)),
+                        FieldValue::Reference(DeclarationId(1460)),
                     ),
                     (
                         "collection_ops".to_string(),
-                        FieldValue::Reference(DeclarationId(1447)),
+                        FieldValue::Reference(DeclarationId(1461)),
                     ),
                     (
                         "values".to_string(),
-                        FieldValue::Reference(DeclarationId(1448)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                 ],
             }),
@@ -50921,15 +51695,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 5439, 5914),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1451),
+            id: DeclarationId(1465),
             name: Some("python_target".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(957),
+                template: DeclarationId(879),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(957)),
+            meta_tag: Some(DeclarationId(879)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -50937,14 +51711,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2246),
+                            constructor: DeclarationId(2118),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2249),
+                            constructor: DeclarationId(2121),
                             payload: vec![],
                         },
                     ),
@@ -50955,22 +51729,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 5916, 6013),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1452),
+            id: DeclarationId(1466),
             name: Some("python_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(959),
+                template: DeclarationId(881),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(959)),
+            meta_tag: Some(DeclarationId(881)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "internal".to_string(),
-                        FieldValue::Reference(DeclarationId(960)),
+                        FieldValue::Reference(DeclarationId(882)),
                     ),
                     (
                         "additional_excluded_prefixes".to_string(),
@@ -50983,15 +51757,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 6015, 6151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1453),
+            id: DeclarationId(1467),
             name: Some("python_execution_requirement".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(961),
+                template: DeclarationId(883),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(961)),
+            meta_tag: Some(DeclarationId(883)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -51004,22 +51778,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 6153, 6232),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1454),
+            id: DeclarationId(1468),
             name: Some("python_int".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -51045,22 +51819,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 6234, 6370),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1455),
+            id: DeclarationId(1469),
             name: Some("python_integer_inhabit_at_i32_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1017),
+                template: DeclarationId(974),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1017)),
+            meta_tag: Some(DeclarationId(974)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -51073,17 +51847,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2327),
+                            constructor: DeclarationId(2258),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1914),
+                                constructor: DeclarationId(1928),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(
                                         "-2147483648".to_string(),
                                     )),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1913),
+                                        constructor: DeclarationId(1927),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1911),
+                                            constructor: DeclarationId(1925),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -51095,7 +51869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1454)),
+                        FieldValue::Reference(DeclarationId(1468)),
                     ),
                 ],
             }),
@@ -51104,22 +51878,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 6463, 6772),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1456),
+            id: DeclarationId(1470),
             name: Some("python_integer_inhabit_unbounded_decl".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1017),
+                template: DeclarationId(974),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1017)),
+            meta_tag: Some(DeclarationId(974)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -51132,16 +51906,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2327),
+                            constructor: DeclarationId(2258),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1915),
+                                constructor: DeclarationId(1929),
                                 payload: vec![],
                             }],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1454)),
+                        FieldValue::Reference(DeclarationId(1468)),
                     ),
                 ],
             }),
@@ -51150,22 +51924,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 6850, 7060),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1457),
+            id: DeclarationId(1471),
             name: Some("python_bool".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -51191,22 +51965,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7062, 7201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1458),
+            id: DeclarationId(1472),
             name: Some("python_string".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -51232,22 +52006,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7203, 7345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1459),
+            id: DeclarationId(1473),
             name: Some("python_node_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -51273,22 +52047,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7347, 7493),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1460),
+            id: DeclarationId(1474),
             name: Some("python_port_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -51314,22 +52088,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7495, 7641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1461),
+            id: DeclarationId(1475),
             name: Some("python_declaration_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -51355,26 +52129,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7643, 7810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1462),
+            id: DeclarationId(1476),
             name: Some("python_declaration_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1316)),
+                        FieldValue::Reference(DeclarationId(1330)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51396,22 +52170,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7812, 7981),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1463),
+            id: DeclarationId(1477),
             name: Some("python_source_span".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -51437,22 +52211,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7983, 8142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1464),
+            id: DeclarationId(1478),
             name: Some("python_dag_port".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -51478,22 +52252,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8144, 8294),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1465),
+            id: DeclarationId(1479),
             name: Some("python_branch_path".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -51519,22 +52293,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8296, 8455),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1466),
+            id: DeclarationId(1480),
             name: Some("python_value_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -51560,22 +52334,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8457, 8613),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1467),
+            id: DeclarationId(1481),
             name: Some("python_transform_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -51601,22 +52375,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8615, 8783),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1468),
+            id: DeclarationId(1482),
             name: Some("python_branch_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -51642,22 +52416,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8785, 8944),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1469),
+            id: DeclarationId(1483),
             name: Some("python_loop_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -51683,22 +52457,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8946, 9099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1470),
+            id: DeclarationId(1484),
             name: Some("python_bind_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -51724,22 +52498,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 9101, 9254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1471),
+            id: DeclarationId(1485),
             name: Some("python_behavior".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -51765,22 +52539,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 9256, 9408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1472),
+            id: DeclarationId(1486),
             name: Some("python_dag".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -51806,26 +52580,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 9410, 9547),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1473),
+            id: DeclarationId(1487),
             name: Some("python_surface_module".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1148)),
+                        FieldValue::Reference(DeclarationId(1099)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51845,7 +52619,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2329),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -51868,26 +52642,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 9621, 9870),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1474),
+            id: DeclarationId(1488),
             name: Some("python_surface_item".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1162)),
+                        FieldValue::Reference(DeclarationId(1113)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51909,26 +52683,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 9872, 10034),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1475),
+            id: DeclarationId(1489),
             name: Some("python_surface_param".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1149)),
+                        FieldValue::Reference(DeclarationId(1100)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51949,7 +52723,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -51968,7 +52742,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -51989,7 +52763,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -52013,26 +52787,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 10036, 10442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1476),
+            id: DeclarationId(1490),
             name: Some("python_surface_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1150)),
+                        FieldValue::Reference(DeclarationId(1101)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52053,7 +52827,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -52072,7 +52846,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -52096,26 +52870,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 10444, 10761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1477),
+            id: DeclarationId(1491),
             name: Some("python_surface_variant".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1151)),
+                        FieldValue::Reference(DeclarationId(1102)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52136,7 +52910,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -52155,7 +52929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -52174,7 +52948,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -52198,26 +52972,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 10763, 11173),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1478),
+            id: DeclarationId(1492),
             name: Some("python_variant_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1152)),
+                        FieldValue::Reference(DeclarationId(1103)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52239,26 +53013,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 11175, 11346),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1479),
+            id: DeclarationId(1493),
             name: Some("python_surface_type".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1154)),
+                        FieldValue::Reference(DeclarationId(1105)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52280,26 +53054,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 11348, 11510),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1480),
+            id: DeclarationId(1494),
             name: Some("python_surface_record_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1155)),
+                        FieldValue::Reference(DeclarationId(1106)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52320,7 +53094,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -52339,7 +53113,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -52358,7 +53132,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -52382,26 +53156,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 11512, 11931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1481),
+            id: DeclarationId(1495),
             name: Some("python_surface_map_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1156)),
+                        FieldValue::Reference(DeclarationId(1107)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52422,7 +53196,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -52443,7 +53217,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -52462,7 +53236,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -52481,7 +53255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -52505,26 +53279,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 11933, 12426),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1482),
+            id: DeclarationId(1496),
             name: Some("python_surface_match_arm".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1157)),
+                        FieldValue::Reference(DeclarationId(1108)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52545,7 +53319,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -52564,7 +53338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -52583,7 +53357,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -52607,26 +53381,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 12428, 12842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1483),
+            id: DeclarationId(1497),
             name: Some("python_surface_pattern_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1158)),
+                        FieldValue::Reference(DeclarationId(1109)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52647,7 +53421,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -52666,7 +53440,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -52685,7 +53459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -52709,26 +53483,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 12844, 13270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1484),
+            id: DeclarationId(1498),
             name: Some("python_surface_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1159)),
+                        FieldValue::Reference(DeclarationId(1110)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52750,26 +53524,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 13272, 13443),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1485),
+            id: DeclarationId(1499),
             name: Some("python_surface_literal".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1160)),
+                        FieldValue::Reference(DeclarationId(1111)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52791,26 +53565,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 13445, 13616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1486),
+            id: DeclarationId(1500),
             name: Some("python_surface_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1161)),
+                        FieldValue::Reference(DeclarationId(1112)),
                     ),
                     (
                         "carrier".to_string(),
@@ -52832,22 +53606,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 13618, 13780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1487),
+            id: DeclarationId(1501),
             name: Some("python_int_add".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -52869,22 +53643,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 13782, 13931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1488),
+            id: DeclarationId(1502),
             name: Some("python_int_sub".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -52906,22 +53680,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 13933, 14082),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1489),
+            id: DeclarationId(1503),
             name: Some("python_int_mul".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -52943,22 +53717,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14084, 14233),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1490),
+            id: DeclarationId(1504),
             name: Some("python_int_div".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -52982,22 +53756,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14235, 14394),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1491),
+            id: DeclarationId(1505),
             name: Some("python_int_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -53019,22 +53793,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14396, 14544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1492),
+            id: DeclarationId(1506),
             name: Some("python_node_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -53056,22 +53830,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14546, 14701),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1493),
+            id: DeclarationId(1507),
             name: Some("python_port_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -53093,22 +53867,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14703, 14858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1494),
+            id: DeclarationId(1508),
             name: Some("python_declaration_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -53130,22 +53904,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14860, 15029),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1495),
+            id: DeclarationId(1509),
             name: Some("python_int_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -53167,22 +53941,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15031, 15179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1496),
+            id: DeclarationId(1510),
             name: Some("python_int_lt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -53204,22 +53978,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15181, 15328),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1497),
+            id: DeclarationId(1511),
             name: Some("python_int_le".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -53241,22 +54015,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15330, 15478),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1498),
+            id: DeclarationId(1512),
             name: Some("python_int_gt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -53278,22 +54052,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15480, 15627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1499),
+            id: DeclarationId(1513),
             name: Some("python_int_ge".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -53315,22 +54089,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15629, 15777),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1500),
+            id: DeclarationId(1514),
             name: Some("python_bool_meet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -53352,22 +54126,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15779, 15937),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1501),
+            id: DeclarationId(1515),
             name: Some("python_bool_join".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -53389,22 +54163,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15939, 16096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1502),
+            id: DeclarationId(1516),
             name: Some("python_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -53413,7 +54187,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2342),
+                            constructor: DeclarationId(2273),
                             payload: vec![],
                         },
                     ),
@@ -53429,22 +54203,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 16098, 16244),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1503),
+            id: DeclarationId(1517),
             name: Some("python_singleton_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -53453,7 +54227,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2343),
+                            constructor: DeclarationId(2274),
                             payload: vec![],
                         },
                     ),
@@ -53467,7 +54241,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2333),
+                                    constructor: DeclarationId(2264),
                                     payload: vec![],
                                 },
                             ),
@@ -53484,22 +54258,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 16246, 16446),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1504),
+            id: DeclarationId(1518),
             name: Some("python_cons_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -53508,7 +54282,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2344),
+                            constructor: DeclarationId(2275),
                             payload: vec![],
                         },
                     ),
@@ -53523,7 +54297,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2333),
+                                        constructor: DeclarationId(2264),
                                         payload: vec![],
                                     },
                                 ),
@@ -53536,7 +54310,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2333),
+                                        constructor: DeclarationId(2264),
                                         payload: vec![],
                                     },
                                 ),
@@ -53554,22 +54328,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 16448, 16673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1505),
+            id: DeclarationId(1519),
             name: Some("python_concat_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -53578,7 +54352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2345),
+                            constructor: DeclarationId(2276),
                             payload: vec![],
                         },
                     ),
@@ -53593,7 +54367,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2333),
+                                        constructor: DeclarationId(2264),
                                         payload: vec![],
                                     },
                                 ),
@@ -53606,7 +54380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2333),
+                                        constructor: DeclarationId(2264),
                                         payload: vec![],
                                     },
                                 ),
@@ -53624,22 +54398,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 16675, 16906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1506),
+            id: DeclarationId(1520),
             name: Some("python_length_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -53648,7 +54422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2346),
+                            constructor: DeclarationId(2277),
                             payload: vec![],
                         },
                     ),
@@ -53662,7 +54436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2332),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -53679,22 +54453,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 16908, 17099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1507),
+            id: DeclarationId(1521),
             name: Some("python_is_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -53703,7 +54477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2347),
+                            constructor: DeclarationId(2278),
                             payload: vec![],
                         },
                     ),
@@ -53717,7 +54491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2332),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -53734,22 +54508,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 17101, 17297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1508),
+            id: DeclarationId(1522),
             name: Some("python_fold_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -53758,7 +54532,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2348),
+                            constructor: DeclarationId(2279),
                             payload: vec![],
                         },
                     ),
@@ -53773,7 +54547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2263),
                                         payload: vec![],
                                     },
                                 ),
@@ -53786,7 +54560,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2333),
+                                        constructor: DeclarationId(2264),
                                         payload: vec![],
                                     },
                                 ),
@@ -53799,7 +54573,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2263),
                                         payload: vec![],
                                     },
                                 ),
@@ -53817,22 +54591,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 17299, 17564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1509),
+            id: DeclarationId(1523),
             name: Some("python_map_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -53841,7 +54615,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2349),
+                            constructor: DeclarationId(2280),
                             payload: vec![],
                         },
                     ),
@@ -53856,7 +54630,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2263),
                                         payload: vec![],
                                     },
                                 ),
@@ -53869,7 +54643,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2263),
                                         payload: vec![],
                                     },
                                 ),
@@ -53887,22 +54661,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 17566, 17788),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1510),
+            id: DeclarationId(1524),
             name: Some("python_filter_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -53911,7 +54685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2350),
+                            constructor: DeclarationId(2281),
                             payload: vec![],
                         },
                     ),
@@ -53926,7 +54700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2263),
                                         payload: vec![],
                                     },
                                 ),
@@ -53939,7 +54713,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2263),
                                         payload: vec![],
                                     },
                                 ),
@@ -53957,22 +54731,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 17790, 18021),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1511),
+            id: DeclarationId(1525),
             name: Some("python_contains_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -53981,7 +54755,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2351),
+                            constructor: DeclarationId(2282),
                             payload: vec![],
                         },
                     ),
@@ -53996,7 +54770,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2263),
                                         payload: vec![],
                                     },
                                 ),
@@ -54009,7 +54783,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2263),
                                         payload: vec![],
                                     },
                                 ),
@@ -54027,22 +54801,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 18023, 18260),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1512),
+            id: DeclarationId(1526),
             name: Some("python_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1031),
+                template: DeclarationId(988),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1031)),
+            meta_tag: Some(DeclarationId(988)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -54062,24 +54836,24 @@ 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(1513), 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(1450))), ("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(1527), name: Some("python_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(988), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(988)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("language".to_string(), FieldValue::Reference(DeclarationId(1464))), ("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(1514),
+            id: DeclarationId(1528),
             name: Some("python_non_empty_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1031),
+                template: DeclarationId(988),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1031)),
+            meta_tag: Some(DeclarationId(988)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -54102,22 +54876,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 18855, 19029),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1515),
+            id: DeclarationId(1529),
             name: Some("python_non_singleton_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1031),
+                template: DeclarationId(988),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1031)),
+            meta_tag: Some(DeclarationId(988)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -54140,22 +54914,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 19031, 19217),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1516),
+            id: DeclarationId(1530),
             name: Some("python_list_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1033),
+                template: DeclarationId(990),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1033)),
+            meta_tag: Some(DeclarationId(990)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "target".to_string(),
@@ -54164,17 +54938,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2284),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1819)),
+                        FieldValue::Reference(DeclarationId(1833)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1821)),
+                        FieldValue::Reference(DeclarationId(1835)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -54207,15 +54981,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 19218, 19532),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1517),
+            id: DeclarationId(1531),
             name: Some("python_correction_style".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(930),
+                template: DeclarationId(1021),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(930)),
+            meta_tag: Some(DeclarationId(1021)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -54243,15 +55017,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 21597, 21739),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1518),
+            id: DeclarationId(1532),
             name: Some("python_clean_emission".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(921),
+                template: DeclarationId(1012),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(921)),
+            meta_tag: Some(DeclarationId(1012)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -54259,55 +55033,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2180),
+                            constructor: DeclarationId(2294),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2185),
+                            constructor: DeclarationId(2299),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2186),
+                            constructor: DeclarationId(2300),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2189),
+                            constructor: DeclarationId(2303),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2193),
+                            constructor: DeclarationId(2307),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2194),
+                            constructor: DeclarationId(2308),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2199),
+                            constructor: DeclarationId(2313),
                             payload: vec![],
                         },
                     ),
                     (
                         "correction_style".to_string(),
-                        FieldValue::Reference(DeclarationId(1517)),
+                        FieldValue::Reference(DeclarationId(1531)),
                     ),
                     (
                         "post_emit_verifier".to_string(),
@@ -54336,7 +55110,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2201),
+                                    constructor: DeclarationId(2315),
                                     payload: vec![],
                                 },
                             ),
@@ -54349,26 +55123,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 21741, 22321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1519),
+            id: DeclarationId(1533),
             name: Some("python_clean_emission_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(922),
+                template: DeclarationId(1013),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(922)),
+            meta_tag: Some(DeclarationId(1013)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                     (
                         "clean_emission".to_string(),
-                        FieldValue::Reference(DeclarationId(1518)),
+                        FieldValue::Reference(DeclarationId(1532)),
                     ),
                 ],
             }),
@@ -54377,15 +55151,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 22323, 22459),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1520),
+            id: DeclarationId(1534),
             name: Some("rust_execution_model".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(957),
+                template: DeclarationId(879),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(957)),
+            meta_tag: Some(DeclarationId(879)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -54393,14 +55167,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2248),
+                            constructor: DeclarationId(2120),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2249),
+                            constructor: DeclarationId(2121),
                             payload: vec![],
                         },
                     ),
@@ -54411,22 +55185,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 5076, 5178),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1521),
+            id: DeclarationId(1535),
             name: Some("rust_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(959),
+                template: DeclarationId(881),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(959)),
+            meta_tag: Some(DeclarationId(881)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "internal".to_string(),
-                        FieldValue::Reference(DeclarationId(960)),
+                        FieldValue::Reference(DeclarationId(882)),
                     ),
                     (
                         "additional_excluded_prefixes".to_string(),
@@ -54441,15 +55215,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 5180, 5332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1522),
+            id: DeclarationId(1536),
             name: Some("rust_execution_requirement".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(961),
+                template: DeclarationId(883),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(961)),
+            meta_tag: Some(DeclarationId(883)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -54462,22 +55236,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 5334, 5409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1523),
+            id: DeclarationId(1537),
             name: Some("rust_int".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -54503,22 +55277,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 5860, 5992),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1524),
+            id: DeclarationId(1538),
             name: Some("rust_uint8".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -54544,22 +55318,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 5994, 6129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1525),
+            id: DeclarationId(1539),
             name: Some("rust_i32".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -54585,22 +55359,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 6131, 6265),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1526),
+            id: DeclarationId(1540),
             name: Some("rust_u32".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -54626,22 +55400,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 6267, 6402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1527),
+            id: DeclarationId(1541),
             name: Some("rust_i128".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -54667,22 +55441,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 6404, 6541),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1528),
+            id: DeclarationId(1542),
             name: Some("rust_u128".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -54708,22 +55482,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 6833, 6971),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1529),
+            id: DeclarationId(1543),
             name: Some("rust_isize".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -54749,22 +55523,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 7374, 7518),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1530),
+            id: DeclarationId(1544),
             name: Some("rust_usize".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -54790,22 +55564,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 7520, 7665),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1531),
+            id: DeclarationId(1545),
             name: Some("rust_integer_inhabit_u32_at_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1017),
+                template: DeclarationId(974),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1017)),
+            meta_tag: Some(DeclarationId(974)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -54818,15 +55592,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2327),
+                            constructor: DeclarationId(2258),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1914),
+                                constructor: DeclarationId(1928),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int("0".to_string())),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1913),
+                                        constructor: DeclarationId(1927),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1911),
+                                            constructor: DeclarationId(1925),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -54838,7 +55612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1526)),
+                        FieldValue::Reference(DeclarationId(1540)),
                     ),
                 ],
             }),
@@ -54847,22 +55621,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 8086, 8385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1532),
+            id: DeclarationId(1546),
             name: Some("rust_integer_inhabit_i32_at_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1017),
+                template: DeclarationId(974),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1017)),
+            meta_tag: Some(DeclarationId(974)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -54875,17 +55649,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2327),
+                            constructor: DeclarationId(2258),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1914),
+                                constructor: DeclarationId(1928),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(
                                         "-2147483648".to_string(),
                                     )),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1913),
+                                        constructor: DeclarationId(1927),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1911),
+                                            constructor: DeclarationId(1925),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -54897,7 +55671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1525)),
+                        FieldValue::Reference(DeclarationId(1539)),
                     ),
                 ],
             }),
@@ -54906,22 +55680,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 8387, 8694),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1533),
+            id: DeclarationId(1547),
             name: Some("rust_integer_inhabit_i32_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1017),
+                template: DeclarationId(974),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1017)),
+            meta_tag: Some(DeclarationId(974)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -54934,13 +55708,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2326),
+                            constructor: DeclarationId(2257),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1525)),
+                        FieldValue::Reference(DeclarationId(1539)),
                     ),
                 ],
             }),
@@ -54949,22 +55723,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 8696, 8901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1534),
+            id: DeclarationId(1548),
             name: Some("rust_integer_inhabit_int64_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1017),
+                template: DeclarationId(974),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1017)),
+            meta_tag: Some(DeclarationId(974)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -54977,13 +55751,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2326),
+                            constructor: DeclarationId(2257),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1523)),
+                        FieldValue::Reference(DeclarationId(1537)),
                     ),
                 ],
             }),
@@ -54992,22 +55766,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 8903, 9106),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1535),
+            id: DeclarationId(1549),
             name: Some("rust_integer_inhabit_i128_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1017),
+                template: DeclarationId(974),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1017)),
+            meta_tag: Some(DeclarationId(974)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -55020,13 +55794,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2326),
+                            constructor: DeclarationId(2257),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1527)),
+                        FieldValue::Reference(DeclarationId(1541)),
                     ),
                 ],
             }),
@@ -55035,22 +55809,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 9108, 9317),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1536),
+            id: DeclarationId(1550),
             name: Some("rust_integer_inhabit_u128_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1017),
+                template: DeclarationId(974),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1017)),
+            meta_tag: Some(DeclarationId(974)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -55063,13 +55837,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2326),
+                            constructor: DeclarationId(2257),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1528)),
+                        FieldValue::Reference(DeclarationId(1542)),
                     ),
                 ],
             }),
@@ -55078,22 +55852,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 9742, 9953),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1537),
+            id: DeclarationId(1551),
             name: Some("rust_integer_inhabit_isize_platform".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1017),
+                template: DeclarationId(974),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1017)),
+            meta_tag: Some(DeclarationId(974)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -55106,13 +55880,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2328),
+                            constructor: DeclarationId(2259),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1529)),
+                        FieldValue::Reference(DeclarationId(1543)),
                     ),
                 ],
             }),
@@ -55121,22 +55895,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 10316, 10533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1538),
+            id: DeclarationId(1552),
             name: Some("rust_integer_inhabit_usize_platform".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1017),
+                template: DeclarationId(974),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1017)),
+            meta_tag: Some(DeclarationId(974)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -55149,13 +55923,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2328),
+                            constructor: DeclarationId(2259),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1530)),
+                        FieldValue::Reference(DeclarationId(1544)),
                     ),
                 ],
             }),
@@ -55164,22 +55938,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 10535, 10754),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1539),
+            id: DeclarationId(1553),
             name: Some("rust_bool".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -55205,22 +55979,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 10756, 10891),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1540),
+            id: DeclarationId(1554),
             name: Some("rust_string".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -55246,22 +56020,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 10893, 11035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1541),
+            id: DeclarationId(1555),
             name: Some("rust_node_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -55287,22 +56061,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 11037, 11179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1542),
+            id: DeclarationId(1556),
             name: Some("rust_port_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -55328,22 +56102,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 11181, 11323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1543),
+            id: DeclarationId(1557),
             name: Some("rust_declaration_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -55369,22 +56143,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 11325, 11488),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1544),
+            id: DeclarationId(1558),
             name: Some("rust_cluster_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -55410,22 +56184,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 11490, 11641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1545),
+            id: DeclarationId(1559),
             name: Some("rust_type_shape".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -55449,7 +56223,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2329),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -55472,22 +56246,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 11643, 11888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1546),
+            id: DeclarationId(1560),
             name: Some("rust_port_state".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -55513,22 +56287,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 11890, 12042),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1547),
+            id: DeclarationId(1561),
             name: Some("rust_port".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -55553,7 +56327,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
+                                        constructor: DeclarationId(2261),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -55572,7 +56346,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
+                                        constructor: DeclarationId(2261),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state_value".to_string(),
                                         ))],
@@ -55593,7 +56367,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -55617,22 +56391,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 12044, 12440),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1548),
+            id: DeclarationId(1562),
             name: Some("rust_source_span".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -55657,7 +56431,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -55676,7 +56450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -55695,7 +56469,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -55719,22 +56493,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 12442, 12840),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1549),
+            id: DeclarationId(1563),
             name: Some("rust_literal_bits".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -55760,22 +56534,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 12842, 13000),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1550),
+            id: DeclarationId(1564),
             name: Some("rust_atom_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -55801,22 +56575,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 13002, 13160),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1551),
+            id: DeclarationId(1565),
             name: Some("rust_cardinality_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -55842,22 +56616,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 13162, 13335),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1552),
+            id: DeclarationId(1566),
             name: Some("rust_interval".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -55883,22 +56657,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 13337, 13485),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1553),
+            id: DeclarationId(1567),
             name: Some("rust_positive_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -55926,22 +56700,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 13487, 13676),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1554),
+            id: DeclarationId(1568),
             name: Some("rust_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -55967,22 +56741,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 13678, 13842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1555),
+            id: DeclarationId(1569),
             name: Some("rust_conj_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -56007,7 +56781,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -56026,7 +56800,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -56050,22 +56824,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 13844, 14146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1556),
+            id: DeclarationId(1570),
             name: Some("rust_template_argument".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -56092,7 +56866,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -56111,7 +56885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -56135,22 +56909,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 14148, 14489),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1557),
+            id: DeclarationId(1571),
             name: Some("rust_phantom_parameter".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -56177,7 +56951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -56196,7 +56970,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -56220,22 +56994,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 14491, 14836),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1558),
+            id: DeclarationId(1572),
             name: Some("rust_nominal_opacity".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -56261,7 +57035,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2329),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -56284,22 +57058,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 14838, 15114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1559),
+            id: DeclarationId(1573),
             name: Some("rust_field_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -56326,7 +57100,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "0".to_string(),
                                         ))],
@@ -56345,7 +57119,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "1".to_string(),
                                         ))],
@@ -56369,22 +57143,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 15116, 15433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1560),
+            id: DeclarationId(1574),
             name: Some("rust_non_empty_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -56409,7 +57183,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -56428,7 +57202,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -56452,22 +57226,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 15435, 15755),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1561),
+            id: DeclarationId(1575),
             name: Some("rust_non_singleton_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -56492,7 +57266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -56511,7 +57285,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -56530,7 +57304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -56554,22 +57328,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 15757, 16170),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1562),
+            id: DeclarationId(1576),
             name: Some("rust_element_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -56593,7 +57367,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2330),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "index_of".to_string(),
                                     ))],
@@ -56616,22 +57390,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 16172, 16413),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1563),
+            id: DeclarationId(1577),
             name: Some("rust_param_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -56656,7 +57430,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
+                                        constructor: DeclarationId(2261),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -56675,7 +57449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
+                                        constructor: DeclarationId(2261),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -56699,22 +57473,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 16415, 16735),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1564),
+            id: DeclarationId(1578),
             name: Some("rust_transform_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -56738,7 +57512,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2330),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -56761,22 +57535,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 16737, 16982),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1565),
+            id: DeclarationId(1579),
             name: Some("rust_member_descent".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -56800,7 +57574,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2329),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -56823,22 +57597,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 16984, 17229),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1566),
+            id: DeclarationId(1580),
             name: Some("rust_intra_cluster_call".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -56862,7 +57636,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2329),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -56885,22 +57659,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 17231, 17494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1567),
+            id: DeclarationId(1581),
             name: Some("rust_cluster".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -56925,7 +57699,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -56946,7 +57720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -56970,22 +57744,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 17496, 17833),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1568),
+            id: DeclarationId(1582),
             name: Some("rust_field_value".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -57011,22 +57785,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 17835, 17990),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1569),
+            id: DeclarationId(1583),
             name: Some("rust_value_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -57052,22 +57826,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 17992, 18144),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1570),
+            id: DeclarationId(1584),
             name: Some("rust_arrow_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -57093,22 +57867,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 18146, 18298),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1571),
+            id: DeclarationId(1585),
             name: Some("rust_type_connective".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -57134,22 +57908,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 18300, 18467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1572),
+            id: DeclarationId(1586),
             name: Some("rust_declaration".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -57174,7 +57948,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -57193,7 +57967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -57214,7 +57988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -57235,7 +58009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -57256,7 +58030,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -57277,7 +58051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -57298,7 +58072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -57319,7 +58093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -57340,7 +58114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -57359,7 +58133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -57383,22 +58157,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 18469, 19490),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1573),
+            id: DeclarationId(1587),
             name: Some("rust_arithmetic_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -57424,22 +58198,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 19492, 19653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1574),
+            id: DeclarationId(1588),
             name: Some("rust_comparison_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -57465,22 +58239,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 19655, 19816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1575),
+            id: DeclarationId(1589),
             name: Some("rust_logical_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -57506,22 +58280,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 19818, 19970),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1576),
+            id: DeclarationId(1590),
             name: Some("rust_operator_kind".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -57547,22 +58321,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 19972, 20133),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1577),
+            id: DeclarationId(1591),
             name: Some("rust_transform_target".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -57588,22 +58362,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 20135, 20305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1578),
+            id: DeclarationId(1592),
             name: Some("rust_branch_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -57629,22 +58403,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 20307, 20471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1579),
+            id: DeclarationId(1593),
             name: Some("rust_payload_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -57671,7 +58445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -57692,7 +58466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -57716,22 +58490,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 20473, 20828),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1580),
+            id: DeclarationId(1594),
             name: Some("rust_branch_path".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -57756,7 +58530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -57777,7 +58551,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
+                                        constructor: DeclarationId(2261),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -57796,7 +58570,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -57815,7 +58589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -57839,22 +58613,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 20830, 21318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1581),
+            id: DeclarationId(1595),
             name: Some("rust_loop_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -57880,22 +58654,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 21320, 21472),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1582),
+            id: DeclarationId(1596),
             name: Some("rust_value_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -57920,7 +58694,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -57939,7 +58713,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "data".to_string(),
                                         ))],
@@ -57960,7 +58734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
+                                        constructor: DeclarationId(2261),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -57979,7 +58753,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -58000,7 +58774,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
+                                        constructor: DeclarationId(2261),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -58024,22 +58798,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 21474, 22247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1583),
+            id: DeclarationId(1597),
             name: Some("rust_transform_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -58064,7 +58838,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -58083,7 +58857,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -58102,7 +58876,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -58123,7 +58897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
+                                        constructor: DeclarationId(2261),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -58142,7 +58916,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -58166,22 +58940,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 22249, 22821),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1584),
+            id: DeclarationId(1598),
             name: Some("rust_branch_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -58206,7 +58980,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -58225,7 +58999,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -58244,7 +59018,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -58265,7 +59039,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
+                                        constructor: DeclarationId(2261),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -58284,7 +59058,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -58305,7 +59079,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
+                                        constructor: DeclarationId(2261),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -58329,22 +59103,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 22823, 23490),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1585),
+            id: DeclarationId(1599),
             name: Some("rust_loop_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -58369,7 +59143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -58388,7 +59162,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -58407,7 +59181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -58426,7 +59200,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -58445,7 +59219,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -58466,7 +59240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
+                                        constructor: DeclarationId(2261),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -58485,7 +59259,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -58509,22 +59283,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 23492, 24201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1586),
+            id: DeclarationId(1600),
             name: Some("rust_bind_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -58549,7 +59323,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -58568,7 +59342,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -58589,7 +59363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
+                                        constructor: DeclarationId(2261),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -58608,7 +59382,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -58627,7 +59401,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -58648,7 +59422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
+                                        constructor: DeclarationId(2261),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -58669,7 +59443,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
+                                        constructor: DeclarationId(2261),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -58693,22 +59467,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 24203, 24963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1587),
+            id: DeclarationId(1601),
             name: Some("rust_behavior".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -58734,22 +59508,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 24965, 25113),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1588),
+            id: DeclarationId(1602),
             name: Some("rust_dag".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -58776,7 +59550,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
+                                        constructor: DeclarationId(2261),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -58795,7 +59569,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
+                                        constructor: DeclarationId(2261),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -58814,7 +59588,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
+                                        constructor: DeclarationId(2261),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -58835,7 +59609,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
+                                        constructor: DeclarationId(2261),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -58859,26 +59633,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 25115, 25595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1589),
+            id: DeclarationId(1603),
             name: Some("rust_surface_module".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1148)),
+                        FieldValue::Reference(DeclarationId(1099)),
                     ),
                     (
                         "carrier".to_string(),
@@ -58900,7 +59674,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2329),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -58923,26 +59697,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 25808, 26068),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1590),
+            id: DeclarationId(1604),
             name: Some("rust_surface_item".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1162)),
+                        FieldValue::Reference(DeclarationId(1113)),
                     ),
                     (
                         "carrier".to_string(),
@@ -58966,26 +59740,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 26070, 26243),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1591),
+            id: DeclarationId(1605),
             name: Some("rust_surface_param".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1149)),
+                        FieldValue::Reference(DeclarationId(1100)),
                     ),
                     (
                         "carrier".to_string(),
@@ -59008,7 +59782,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -59027,7 +59801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -59048,7 +59822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -59072,26 +59846,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 26245, 26662),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1592),
+            id: DeclarationId(1606),
             name: Some("rust_surface_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1150)),
+                        FieldValue::Reference(DeclarationId(1101)),
                     ),
                     (
                         "carrier".to_string(),
@@ -59114,7 +59888,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -59133,7 +59907,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -59157,26 +59931,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 26664, 26992),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1593),
+            id: DeclarationId(1607),
             name: Some("rust_surface_variant".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1151)),
+                        FieldValue::Reference(DeclarationId(1102)),
                     ),
                     (
                         "carrier".to_string(),
@@ -59199,7 +59973,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -59218,7 +59992,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -59237,7 +60011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -59261,26 +60035,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 26994, 27415),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1594),
+            id: DeclarationId(1608),
             name: Some("rust_variant_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1152)),
+                        FieldValue::Reference(DeclarationId(1103)),
                     ),
                     (
                         "carrier".to_string(),
@@ -59304,26 +60078,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 27417, 27599),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1595),
+            id: DeclarationId(1609),
             name: Some("rust_surface_type".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1154)),
+                        FieldValue::Reference(DeclarationId(1105)),
                     ),
                     (
                         "carrier".to_string(),
@@ -59347,26 +60121,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 27601, 27774),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1596),
+            id: DeclarationId(1610),
             name: Some("rust_surface_record_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1155)),
+                        FieldValue::Reference(DeclarationId(1106)),
                     ),
                     (
                         "carrier".to_string(),
@@ -59389,7 +60163,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -59408,7 +60182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -59427,7 +60201,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -59451,26 +60225,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 27776, 28206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1597),
+            id: DeclarationId(1611),
             name: Some("rust_surface_map_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1156)),
+                        FieldValue::Reference(DeclarationId(1107)),
                     ),
                     (
                         "carrier".to_string(),
@@ -59493,7 +60267,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -59514,7 +60288,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -59533,7 +60307,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -59552,7 +60326,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -59576,26 +60350,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 28208, 28712),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1598),
+            id: DeclarationId(1612),
             name: Some("rust_surface_match_arm".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1157)),
+                        FieldValue::Reference(DeclarationId(1108)),
                     ),
                     (
                         "carrier".to_string(),
@@ -59618,7 +60392,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -59637,7 +60411,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -59656,7 +60430,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -59680,26 +60454,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 28714, 29139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1599),
+            id: DeclarationId(1613),
             name: Some("rust_surface_pattern_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1158)),
+                        FieldValue::Reference(DeclarationId(1109)),
                     ),
                     (
                         "carrier".to_string(),
@@ -59722,7 +60496,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -59741,7 +60515,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -59760,7 +60534,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2260),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -59784,26 +60558,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 29141, 29578),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1600),
+            id: DeclarationId(1614),
             name: Some("rust_surface_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1159)),
+                        FieldValue::Reference(DeclarationId(1110)),
                     ),
                     (
                         "carrier".to_string(),
@@ -59827,26 +60601,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 29580, 29762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1601),
+            id: DeclarationId(1615),
             name: Some("rust_surface_literal".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1160)),
+                        FieldValue::Reference(DeclarationId(1111)),
                     ),
                     (
                         "carrier".to_string(),
@@ -59870,26 +60644,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 29764, 29946),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1602),
+            id: DeclarationId(1616),
             name: Some("rust_surface_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1161)),
+                        FieldValue::Reference(DeclarationId(1112)),
                     ),
                     (
                         "carrier".to_string(),
@@ -59913,22 +60687,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 29948, 30121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1603),
+            id: DeclarationId(1617),
             name: Some("rust_int_add".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -59950,22 +60724,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 30976, 31121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1604),
+            id: DeclarationId(1618),
             name: Some("rust_int_sub".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -59987,22 +60761,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 31123, 31268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1605),
+            id: DeclarationId(1619),
             name: Some("rust_int_mul".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -60024,22 +60798,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 31270, 31415),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1606),
+            id: DeclarationId(1620),
             name: Some("rust_int_div".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -60063,22 +60837,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 31417, 31575),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1607),
+            id: DeclarationId(1621),
             name: Some("rust_int_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -60100,22 +60874,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 32025, 32169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1608),
+            id: DeclarationId(1622),
             name: Some("rust_node_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -60137,22 +60911,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 32171, 32322),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1609),
+            id: DeclarationId(1623),
             name: Some("rust_port_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -60174,22 +60948,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 32324, 32475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1610),
+            id: DeclarationId(1624),
             name: Some("rust_declaration_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -60211,22 +60985,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 32477, 32642),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1611),
+            id: DeclarationId(1625),
             name: Some("rust_string_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -60248,22 +61022,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 32835, 32985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1612),
+            id: DeclarationId(1626),
             name: Some("rust_int_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -60285,22 +61059,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 32987, 33131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1613),
+            id: DeclarationId(1627),
             name: Some("rust_node_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -60322,22 +61096,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 33133, 33284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1614),
+            id: DeclarationId(1628),
             name: Some("rust_port_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -60359,22 +61133,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 33286, 33437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1615),
+            id: DeclarationId(1629),
             name: Some("rust_declaration_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -60396,22 +61170,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 33439, 33604),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1616),
+            id: DeclarationId(1630),
             name: Some("rust_int_lt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -60433,22 +61207,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 33606, 33749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1617),
+            id: DeclarationId(1631),
             name: Some("rust_int_le".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -60470,22 +61244,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 33751, 33895),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1618),
+            id: DeclarationId(1632),
             name: Some("rust_int_gt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -60507,22 +61281,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 33897, 34040),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1619),
+            id: DeclarationId(1633),
             name: Some("rust_int_ge".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -60544,22 +61318,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 34042, 34186),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1620),
+            id: DeclarationId(1634),
             name: Some("rust_bool_meet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -60581,22 +61355,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 34188, 34341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1621),
+            id: DeclarationId(1635),
             name: Some("rust_bool_join".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1021),
+                template: DeclarationId(978),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1021)),
+            meta_tag: Some(DeclarationId(978)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -60618,26 +61392,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 34343, 34496),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1622),
+            id: DeclarationId(1636),
             name: Some("rust_let_stmt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(979),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(979)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1314)),
+                        FieldValue::Reference(DeclarationId(1328)),
                     ),
                     (
                         "carrier".to_string(),
@@ -60656,26 +61430,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 35246, 35385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1623),
+            id: DeclarationId(1637),
             name: Some("rust_if_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(979),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(979)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1312)),
+                        FieldValue::Reference(DeclarationId(1326)),
                     ),
                     (
                         "carrier".to_string(),
@@ -60694,26 +61468,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 35387, 35534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1624),
+            id: DeclarationId(1638),
             name: Some("rust_main_wrap".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1022),
+                template: DeclarationId(979),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1022)),
+            meta_tag: Some(DeclarationId(979)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1315)),
+                        FieldValue::Reference(DeclarationId(1329)),
                     ),
                     (
                         "carrier".to_string(),
@@ -60733,22 +61507,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 35536, 35706),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1625),
+            id: DeclarationId(1639),
             name: Some("rust_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -60757,7 +61531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2342),
+                            constructor: DeclarationId(2273),
                             payload: vec![],
                         },
                     ),
@@ -60773,22 +61547,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 37083, 37225),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1626),
+            id: DeclarationId(1640),
             name: Some("rust_singleton_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -60797,7 +61571,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2343),
+                            constructor: DeclarationId(2274),
                             payload: vec![],
                         },
                     ),
@@ -60811,7 +61585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2333),
+                                    constructor: DeclarationId(2264),
                                     payload: vec![],
                                 },
                             ),
@@ -60828,22 +61602,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 37227, 37423),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1627),
+            id: DeclarationId(1641),
             name: Some("rust_cons_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -60852,7 +61626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2344),
+                            constructor: DeclarationId(2275),
                             payload: vec![],
                         },
                     ),
@@ -60867,7 +61641,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2333),
+                                        constructor: DeclarationId(2264),
                                         payload: vec![],
                                     },
                                 ),
@@ -60880,7 +61654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2333),
+                                        constructor: DeclarationId(2264),
                                         payload: vec![],
                                     },
                                 ),
@@ -60898,22 +61672,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 37425, 37646),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1628),
+            id: DeclarationId(1642),
             name: Some("rust_concat_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -60922,7 +61696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2345),
+                            constructor: DeclarationId(2276),
                             payload: vec![],
                         },
                     ),
@@ -60937,7 +61711,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2333),
+                                        constructor: DeclarationId(2264),
                                         payload: vec![],
                                     },
                                 ),
@@ -60950,7 +61724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2333),
+                                        constructor: DeclarationId(2264),
                                         payload: vec![],
                                     },
                                 ),
@@ -60968,22 +61742,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 37648, 37875),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1629),
+            id: DeclarationId(1643),
             name: Some("rust_length_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -60992,7 +61766,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2346),
+                            constructor: DeclarationId(2277),
                             payload: vec![],
                         },
                     ),
@@ -61006,7 +61780,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2332),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -61023,22 +61797,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 37877, 38064),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1630),
+            id: DeclarationId(1644),
             name: Some("rust_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1031),
+                template: DeclarationId(988),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1031)),
+            meta_tag: Some(DeclarationId(988)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -61059,22 +61833,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 38066, 38209),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1631),
+            id: DeclarationId(1645),
             name: Some("rust_result_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1031),
+                template: DeclarationId(988),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1031)),
+            meta_tag: Some(DeclarationId(988)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -61097,26 +61871,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 38488, 38659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1632),
+            id: DeclarationId(1646),
             name: Some("rust_lookup_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1031),
+                template: DeclarationId(988),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1031)),
+            meta_tag: Some(DeclarationId(988)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1143)),
+                        FieldValue::Reference(DeclarationId(894)),
                     ),
                     (
                         "carrier".to_string(),
@@ -61133,26 +61907,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 38661, 38811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1633),
+            id: DeclarationId(1647),
             name: Some("rust_witness_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1031),
+                template: DeclarationId(988),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1031)),
+            meta_tag: Some(DeclarationId(988)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(984)),
+                        FieldValue::Reference(DeclarationId(1041)),
                     ),
                     (
                         "carrier".to_string(),
@@ -61169,26 +61943,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 38813, 38966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1634),
+            id: DeclarationId(1648),
             name: Some("rust_lens_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1031),
+                template: DeclarationId(988),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1031)),
+            meta_tag: Some(DeclarationId(988)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1128)),
+                        FieldValue::Reference(DeclarationId(1080)),
                     ),
                     (
                         "carrier".to_string(),
@@ -61205,22 +61979,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 38968, 39112),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1635),
+            id: DeclarationId(1649),
             name: Some("rust_monoid_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1031),
+                template: DeclarationId(988),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1031)),
+            meta_tag: Some(DeclarationId(988)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -61241,31 +62015,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 39114, 39264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1636),
+            id: DeclarationId(1650),
             name: Some("rust_lens_enforcement_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1031),
+                template: DeclarationId(988),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1031)),
+            meta_tag: Some(DeclarationId(988)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1132)),
+                        FieldValue::Reference(DeclarationId(1084)),
                     ),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String(
-                            "LensEnforcement<{key}, {value}>".to_string(),
+                            "LensEnforcement<{key}, {value}, {extra}>".to_string(),
                         )),
                     ),
                     (
@@ -61276,34 +62050,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 39266, 39449),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 39266, 39458),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1637),
+            id: DeclarationId(1651),
             name: Some("rust_enforceable_lens_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1031),
+                template: DeclarationId(988),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1031)),
+            meta_tag: Some(DeclarationId(988)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1135)),
+                        FieldValue::Reference(DeclarationId(1088)),
                     ),
                     (
                         "carrier".to_string(),
                         FieldValue::Literal(LiteralBits::String(
-                            "EnforceableLens<{key}, {value}>".to_string(),
+                            "EnforceableLens<{key}, {value}, {extra}>".to_string(),
                         )),
                     ),
                     (
@@ -61314,25 +62088,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 39451, 39634),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 39460, 39652),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1638),
+            id: DeclarationId(1652),
             name: Some("rust_map_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1031),
+                template: DeclarationId(988),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1031)),
+            meta_tag: Some(DeclarationId(988)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -61352,25 +62126,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 39636, 39786),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 39654, 39804),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1639),
+            id: DeclarationId(1653),
             name: Some("rust_is_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -61379,7 +62153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2347),
+                            constructor: DeclarationId(2278),
                             payload: vec![],
                         },
                     ),
@@ -61393,7 +62167,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2332),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -61407,25 +62181,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 39788, 39980),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 39806, 39998),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1640),
+            id: DeclarationId(1654),
             name: Some("rust_fold_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -61434,7 +62208,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2348),
+                            constructor: DeclarationId(2279),
                             payload: vec![],
                         },
                     ),
@@ -61449,7 +62223,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2263),
                                         payload: vec![],
                                     },
                                 ),
@@ -61462,7 +62236,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2333),
+                                        constructor: DeclarationId(2264),
                                         payload: vec![],
                                     },
                                 ),
@@ -61475,7 +62249,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2263),
                                         payload: vec![],
                                     },
                                 ),
@@ -61490,25 +62264,25 @@ 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", 40000, 40261),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1641),
+            id: DeclarationId(1655),
             name: Some("rust_map_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -61517,7 +62291,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2349),
+                            constructor: DeclarationId(2280),
                             payload: vec![],
                         },
                     ),
@@ -61532,7 +62306,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2263),
                                         payload: vec![],
                                     },
                                 ),
@@ -61545,7 +62319,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2263),
                                         payload: vec![],
                                     },
                                 ),
@@ -61560,25 +62334,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 40245, 40463),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 40263, 40481),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1642),
+            id: DeclarationId(1656),
             name: Some("rust_filter_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -61587,7 +62361,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2350),
+                            constructor: DeclarationId(2281),
                             payload: vec![],
                         },
                     ),
@@ -61602,7 +62376,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2263),
                                         payload: vec![],
                                     },
                                 ),
@@ -61615,7 +62389,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2263),
                                         payload: vec![],
                                     },
                                 ),
@@ -61630,25 +62404,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 40465, 40692),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 40483, 40710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1643),
+            id: DeclarationId(1657),
             name: Some("rust_contains_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
+                template: DeclarationId(980),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
+            meta_tag: Some(DeclarationId(980)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -61657,7 +62431,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2351),
+                            constructor: DeclarationId(2282),
                             payload: vec![],
                         },
                     ),
@@ -61672,7 +62446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2263),
                                         payload: vec![],
                                     },
                                 ),
@@ -61685,7 +62459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2263),
                                         payload: vec![],
                                     },
                                 ),
@@ -61700,25 +62474,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 40694, 40927),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 40712, 40945),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1644),
+            id: DeclarationId(1658),
             name: Some("rust_list_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1033),
+                template: DeclarationId(990),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1033)),
+            meta_tag: Some(DeclarationId(990)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -61727,17 +62501,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2284),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1819)),
+                        FieldValue::Reference(DeclarationId(1833)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1821)),
+                        FieldValue::Reference(DeclarationId(1835)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -61769,18 +62543,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 41155, 41459),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 41173, 41477),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1645),
+            id: DeclarationId(1659),
             name: Some("rust_statements".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1035),
+                template: DeclarationId(992),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1035)),
+            meta_tag: Some(DeclarationId(992)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -61801,18 +62575,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 41461, 41599),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 41479, 41617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1646),
+            id: DeclarationId(1660),
             name: Some("rust_expressions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1036),
+                template: DeclarationId(993),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1036)),
+            meta_tag: Some(DeclarationId(993)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -61835,18 +62609,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 41601, 41754),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 41619, 41772),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1647),
+            id: DeclarationId(1661),
             name: Some("rust_control_flow".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1038),
+                template: DeclarationId(995),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1038)),
+            meta_tag: Some(DeclarationId(995)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -61880,18 +62654,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 41756, 41946),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 41774, 41964),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1648),
+            id: DeclarationId(1662),
             name: Some("rust_literals".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1039),
+                template: DeclarationId(996),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1039)),
+            meta_tag: Some(DeclarationId(996)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -61912,18 +62686,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 41948, 42060),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 41966, 42078),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1649),
+            id: DeclarationId(1663),
             name: Some("rust_modules".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1040),
+                template: DeclarationId(997),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1040)),
+            meta_tag: Some(DeclarationId(997)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -61934,18 +62708,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 42062, 42122),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 42080, 42140),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1650),
+            id: DeclarationId(1664),
             name: Some("rust_functions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1041),
+                template: DeclarationId(998),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1041)),
+            meta_tag: Some(DeclarationId(998)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -61980,18 +62754,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 42124, 42402),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 42142, 42420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1651),
+            id: DeclarationId(1665),
             name: Some("rust_type_applications".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1042),
+                template: DeclarationId(999),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1042)),
+            meta_tag: Some(DeclarationId(999)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -62002,18 +62776,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 42404, 42492),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 42422, 42510),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1652),
+            id: DeclarationId(1666),
             name: Some("rust_type_defs".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1043),
+                template: DeclarationId(1000),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1043)),
+            meta_tag: Some(DeclarationId(1000)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -62048,18 +62822,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 42494, 42796),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 42512, 42814),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1653),
+            id: DeclarationId(1667),
             name: Some("rust_record_derive_templates".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1044),
+                template: DeclarationId(1001),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1044)),
+            meta_tag: Some(DeclarationId(1001)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -62080,18 +62854,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 42798, 43011),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 42816, 43029),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1654),
+            id: DeclarationId(1668),
             name: Some("rust_patterns".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1045),
+                template: DeclarationId(1002),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1045)),
+            meta_tag: Some(DeclarationId(1002)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -62138,18 +62912,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 43013, 43348),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 43031, 43366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1655),
+            id: DeclarationId(1669),
             name: Some("rust_language_spec_free_monoid_concat_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
+                template: DeclarationId(1011),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -62171,7 +62945,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2360),
+                            constructor: DeclarationId(2291),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{ let mut __left = {left}; __left.extend({right}); __left }"
                                     .to_string(),
@@ -62185,7 +62959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ),
@@ -62193,18 +62967,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 43350, 43720),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 43368, 43738),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1656),
+            id: DeclarationId(1670),
             name: Some("rust_language_spec_free_monoid_length_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
+                template: DeclarationId(1011),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -62225,7 +62999,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2360),
+                            constructor: DeclarationId(2291),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).len() as i64".to_string(),
                             ))],
@@ -62238,7 +63012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ),
@@ -62246,18 +63020,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 43722, 44016),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 43740, 44034),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1657),
+            id: DeclarationId(1671),
             name: Some("rust_language_spec_free_monoid_emptiness_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
+                template: DeclarationId(1011),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -62276,7 +63050,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2360),
+                            constructor: DeclarationId(2291),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).is_empty()".to_string(),
                             ))],
@@ -62289,7 +63063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ),
@@ -62297,18 +63071,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 44187, 44482),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 44205, 44500),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1658),
+            id: DeclarationId(1672),
             name: Some("rust_language_spec_free_monoid_fold_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
+                template: DeclarationId(1011),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -62329,7 +63103,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2360),
+                            constructor: DeclarationId(2291),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).iter().fold({init}, {body})".to_string(),
                             ))],
@@ -62342,7 +63116,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ),
@@ -62350,18 +63124,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 44484, 44804),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 44502, 44822),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1659),
+            id: DeclarationId(1673),
             name: Some("rust_language_spec_map_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
+                template: DeclarationId(1011),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -62382,7 +63156,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2360),
+                            constructor: DeclarationId(2291),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).iter().map({body}).collect::<Vec<_>>()".to_string(),
                             ))],
@@ -62395,7 +63169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ),
@@ -62403,19 +63177,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 44806, 45134),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 44824, 45152),
         });
-        declarations.push(Declaration { id: DeclarationId(1660), 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(1655))), ("length_contract".to_string(), FieldValue::Reference(DeclarationId(1656))), ("is_empty_contract".to_string(), FieldValue::Reference(DeclarationId(1657))), ("fold_contract".to_string(), FieldValue::Reference(DeclarationId(1658))), ("filter_contract".to_string(), FieldValue::Reference(DeclarationId(1186))), ("flat_map_contract".to_string(), FieldValue::Reference(DeclarationId(1189))), ("any_contract".to_string(), FieldValue::Reference(DeclarationId(1187))), ("all_contract".to_string(), FieldValue::Reference(DeclarationId(1188))), ("map_contract".to_string(), FieldValue::Reference(DeclarationId(1659))), ("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(1674), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1003), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1003)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat_contract".to_string(), FieldValue::Reference(DeclarationId(1669))), ("length_contract".to_string(), FieldValue::Reference(DeclarationId(1670))), ("is_empty_contract".to_string(), FieldValue::Reference(DeclarationId(1671))), ("fold_contract".to_string(), FieldValue::Reference(DeclarationId(1672))), ("filter_contract".to_string(), FieldValue::Reference(DeclarationId(1135))), ("flat_map_contract".to_string(), FieldValue::Reference(DeclarationId(1138))), ("any_contract".to_string(), FieldValue::Reference(DeclarationId(1136))), ("all_contract".to_string(), FieldValue::Reference(DeclarationId(1137))), ("map_contract".to_string(), FieldValue::Reference(DeclarationId(1673))), ("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", 45154, 46030) });
         declarations.push(Declaration {
-            id: DeclarationId(1661),
+            id: DeclarationId(1675),
             name: Some("rust_value_construction".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1047),
+                template: DeclarationId(1004),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1047)),
+            meta_tag: Some(DeclarationId(1004)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -62448,18 +63222,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 46014, 46286),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 46032, 46304),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1662),
+            id: DeclarationId(1676),
             name: Some("rust_rendering".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1048),
+                template: DeclarationId(1005),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1048)),
+            meta_tag: Some(DeclarationId(1005)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -62467,14 +63241,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "read".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2285),
                             payload: vec![],
                         },
                     ),
                     (
                         "construct".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2356),
+                            constructor: DeclarationId(2287),
                             payload: vec![],
                         },
                     ),
@@ -62482,86 +63256,86 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 46288, 46369),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 46306, 46387),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1663),
+            id: DeclarationId(1677),
             name: Some("rust_language".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1051),
+                template: DeclarationId(1008),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1051)),
+            meta_tag: Some(DeclarationId(1008)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "statements".to_string(),
-                        FieldValue::Reference(DeclarationId(1645)),
+                        FieldValue::Reference(DeclarationId(1659)),
                     ),
                     (
                         "expressions".to_string(),
-                        FieldValue::Reference(DeclarationId(1646)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "control_flow".to_string(),
-                        FieldValue::Reference(DeclarationId(1647)),
+                        FieldValue::Reference(DeclarationId(1661)),
                     ),
                     (
                         "literals".to_string(),
-                        FieldValue::Reference(DeclarationId(1648)),
+                        FieldValue::Reference(DeclarationId(1662)),
                     ),
                     (
                         "modules".to_string(),
-                        FieldValue::Reference(DeclarationId(1649)),
+                        FieldValue::Reference(DeclarationId(1663)),
                     ),
                     (
                         "functions".to_string(),
-                        FieldValue::Reference(DeclarationId(1650)),
+                        FieldValue::Reference(DeclarationId(1664)),
                     ),
                     (
                         "type_applications".to_string(),
-                        FieldValue::Reference(DeclarationId(1651)),
+                        FieldValue::Reference(DeclarationId(1665)),
                     ),
                     (
                         "type_definitions".to_string(),
-                        FieldValue::Reference(DeclarationId(1652)),
+                        FieldValue::Reference(DeclarationId(1666)),
                     ),
                     (
                         "record_derive_templates".to_string(),
-                        FieldValue::Reference(DeclarationId(1653)),
+                        FieldValue::Reference(DeclarationId(1667)),
                     ),
                     (
                         "patterns".to_string(),
-                        FieldValue::Reference(DeclarationId(1654)),
+                        FieldValue::Reference(DeclarationId(1668)),
                     ),
                     (
                         "collection_ops".to_string(),
-                        FieldValue::Reference(DeclarationId(1660)),
+                        FieldValue::Reference(DeclarationId(1674)),
                     ),
                     (
                         "values".to_string(),
-                        FieldValue::Reference(DeclarationId(1661)),
+                        FieldValue::Reference(DeclarationId(1675)),
                     ),
                 ],
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 46371, 46816),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 46389, 46834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1664),
+            id: DeclarationId(1678),
             name: Some("rust_correction_style".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(930),
+                template: DeclarationId(1021),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(930)),
+            meta_tag: Some(DeclarationId(1021)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -62586,18 +63360,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 48240, 48379),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 48258, 48397),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1665),
+            id: DeclarationId(1679),
             name: Some("rust_clean_emission".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(921),
+                template: DeclarationId(1012),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(921)),
+            meta_tag: Some(DeclarationId(1012)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -62605,55 +63379,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2180),
+                            constructor: DeclarationId(2294),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2183),
+                            constructor: DeclarationId(2297),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2187),
+                            constructor: DeclarationId(2301),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2189),
+                            constructor: DeclarationId(2303),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2192),
+                            constructor: DeclarationId(2306),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2195),
+                            constructor: DeclarationId(2309),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2198),
+                            constructor: DeclarationId(2312),
                             payload: vec![],
                         },
                     ),
                     (
                         "correction_style".to_string(),
-                        FieldValue::Reference(DeclarationId(1664)),
+                        FieldValue::Reference(DeclarationId(1678)),
                     ),
                     (
                         "post_emit_verifier".to_string(),
@@ -62685,7 +63459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2201),
+                                    constructor: DeclarationId(2315),
                                     payload: vec![],
                                 },
                             ),
@@ -62695,38 +63469,38 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 48381, 48994),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 48399, 49012),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1666),
+            id: DeclarationId(1680),
             name: Some("rust_clean_emission_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(922),
+                template: DeclarationId(1013),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(922)),
+            meta_tag: Some(DeclarationId(1013)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "clean_emission".to_string(),
-                        FieldValue::Reference(DeclarationId(1665)),
+                        FieldValue::Reference(DeclarationId(1679)),
                     ),
                 ],
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 48996, 49126),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 49014, 49144),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1667),
+            id: DeclarationId(1681),
             name: Some("rust_port_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(829),
@@ -62747,10 +63521,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 50228, 50331),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 50246, 50349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1668),
+            id: DeclarationId(1682),
             name: Some("rust_node_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(829),
@@ -62771,10 +63545,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 50333, 50436),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 50351, 50454),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1669),
+            id: DeclarationId(1683),
             name: Some("rust_resolve_producer_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(829),
@@ -62795,10 +63569,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 50438, 50565),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 50456, 50583),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1670),
+            id: DeclarationId(1684),
             name: Some("port_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(830),
@@ -62817,20 +63591,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1667)),
+                        FieldValue::Reference(DeclarationId(1681)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                 ],
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 50567, 50698),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 50585, 50716),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1671),
+            id: DeclarationId(1685),
             name: Some("node_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(830),
@@ -62849,20 +63623,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1668)),
+                        FieldValue::Reference(DeclarationId(1682)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                 ],
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 50700, 50831),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 50718, 50849),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1672),
+            id: DeclarationId(1686),
             name: Some("resolve_producer_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(830),
@@ -62881,20 +63655,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1669)),
+                        FieldValue::Reference(DeclarationId(1683)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                 ],
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 50833, 51000),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 50851, 51018),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1673),
+            id: DeclarationId(1687),
             name: Some("rust_lane2_workflow_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(829),
@@ -62915,10 +63689,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 51511, 51640),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 51529, 51658),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1674),
+            id: DeclarationId(1688),
             name: Some("lane2_workflow_at_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(830),
@@ -62937,20 +63711,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1673)),
+                        FieldValue::Reference(DeclarationId(1687)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                 ],
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 51642, 51809),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 51660, 51827),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1675),
+            id: DeclarationId(1689),
             name: Some("rust_workflow_root_port_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(829),
@@ -62971,10 +63745,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 52504, 52618),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 52522, 52636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1676),
+            id: DeclarationId(1690),
             name: Some("workflow_root_port_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(830),
@@ -62993,35 +63767,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1675)),
+                        FieldValue::Reference(DeclarationId(1689)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                 ],
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 52620, 52793),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 52638, 52811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1677),
+            id: DeclarationId(1691),
             name: Some("rust_workflow_root".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1016),
+                template: DeclarationId(973),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1016)),
+            meta_tag: Some(DeclarationId(973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "target".to_string(),
@@ -63044,10 +63818,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 53205, 53366),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 53223, 53384),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1678),
+            id: DeclarationId(1692),
             name: Some("rust_declaration_by_id_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(829),
@@ -63068,10 +63842,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 53693, 53816),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 53711, 53834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1679),
+            id: DeclarationId(1693),
             name: Some("declaration_by_id_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(830),
@@ -63090,20 +63864,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1678)),
+                        FieldValue::Reference(DeclarationId(1692)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                 ],
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 53818, 53988),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 53836, 54006),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1680),
+            id: DeclarationId(1694),
             name: Some("rust_declaration_by_name_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(829),
@@ -63124,10 +63898,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 54335, 54464),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 54353, 54482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1681),
+            id: DeclarationId(1695),
             name: Some("declaration_by_name_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(830),
@@ -63146,20 +63920,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1680)),
+                        FieldValue::Reference(DeclarationId(1694)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                 ],
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 54466, 54642),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 54484, 54660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1682),
+            id: DeclarationId(1696),
             name: Some("rust_per_call_pattern_at_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(829),
@@ -63180,10 +63954,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 54862, 54982),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 54880, 55000),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1683),
+            id: DeclarationId(1697),
             name: Some("per_call_pattern_at_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(830),
@@ -63198,24 +63972,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "accessor".to_string(),
-                        FieldValue::Reference(DeclarationId(936)),
+                        FieldValue::Reference(DeclarationId(957)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1682)),
+                        FieldValue::Reference(DeclarationId(1696)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                 ],
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 54984, 55160),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 55002, 55178),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1684),
+            id: DeclarationId(1698),
             name: Some("rust_per_call_descent_operand_port_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(829),
@@ -63236,10 +64010,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 55346, 55486),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 55364, 55504),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1685),
+            id: DeclarationId(1699),
             name: Some("per_call_descent_operand_port_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(830),
@@ -63254,24 +64028,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "accessor".to_string(),
-                        FieldValue::Reference(DeclarationId(937)),
+                        FieldValue::Reference(DeclarationId(958)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1684)),
+                        FieldValue::Reference(DeclarationId(1698)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                 ],
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 55488, 55694),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 55506, 55712),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1686),
+            id: DeclarationId(1700),
             name: Some("CompilerHostRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63290,21 +64064,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 453, 502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1687),
+            id: DeclarationId(1701),
             name: Some("PipelineSnapshotKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "SnapshotSurface".to_string(),
-                        ty: DeclarationId(2767),
+                        ty: DeclarationId(2787),
                     },
                     Field {
                         label: "SnapshotDag".to_string(),
-                        ty: DeclarationId(2768),
+                        ty: DeclarationId(2788),
                     },
                     Field {
                         label: "SnapshotText".to_string(),
-                        ty: DeclarationId(2769),
+                        ty: DeclarationId(2789),
                     },
                 ],
             },
@@ -63319,21 +64093,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 504, 576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1688),
+            id: DeclarationId(1702),
             name: Some("PipelineStageBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "stage".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                     Field {
                         label: "realization".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                     Field {
                         label: "snapshot".to_string(),
-                        ty: DeclarationId(1687),
+                        ty: DeclarationId(1701),
                     },
                 ],
             },
@@ -63348,7 +64122,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 578, 694),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1689),
+            id: DeclarationId(1703),
             name: Some("parse_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63358,7 +64132,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1686)),
+            meta_tag: Some(DeclarationId(1700)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -63372,7 +64146,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 696, 780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1690),
+            id: DeclarationId(1704),
             name: Some("lower_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63382,7 +64156,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1686)),
+            meta_tag: Some(DeclarationId(1700)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -63396,7 +64170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 782, 866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1691),
+            id: DeclarationId(1705),
             name: Some("infer_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63406,7 +64180,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1686)),
+            meta_tag: Some(DeclarationId(1700)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -63420,7 +64194,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 868, 952),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1692),
+            id: DeclarationId(1706),
             name: Some("compute_ownership_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63430,7 +64204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1686)),
+            meta_tag: Some(DeclarationId(1700)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -63446,7 +64220,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 954, 1062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1693),
+            id: DeclarationId(1707),
             name: Some("emit_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63456,7 +64230,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1686)),
+            meta_tag: Some(DeclarationId(1700)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -63470,7 +64244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1064, 1146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1694),
+            id: DeclarationId(1708),
             name: Some("lens_complexity_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63480,7 +64254,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1686)),
+            meta_tag: Some(DeclarationId(1700)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -63496,31 +64270,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1148, 1252),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1695),
+            id: DeclarationId(1709),
             name: Some("parse_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1688),
+                template: DeclarationId(1702),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1688)),
+            meta_tag: Some(DeclarationId(1702)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1701)),
+                        FieldValue::Reference(DeclarationId(1715)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1689)),
+                        FieldValue::Reference(DeclarationId(1703)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2767),
+                            constructor: DeclarationId(2787),
                             payload: vec![],
                         },
                     ),
@@ -63531,31 +64305,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1254, 1382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1696),
+            id: DeclarationId(1710),
             name: Some("lower_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1688),
+                template: DeclarationId(1702),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1688)),
+            meta_tag: Some(DeclarationId(1702)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1702)),
+                        FieldValue::Reference(DeclarationId(1716)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1690)),
+                        FieldValue::Reference(DeclarationId(1704)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2768),
+                            constructor: DeclarationId(2788),
                             payload: vec![],
                         },
                     ),
@@ -63566,31 +64340,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1384, 1508),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1697),
+            id: DeclarationId(1711),
             name: Some("infer_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1688),
+                template: DeclarationId(1702),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1688)),
+            meta_tag: Some(DeclarationId(1702)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1703)),
+                        FieldValue::Reference(DeclarationId(1717)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1691)),
+                        FieldValue::Reference(DeclarationId(1705)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2768),
+                            constructor: DeclarationId(2788),
                             payload: vec![],
                         },
                     ),
@@ -63601,31 +64375,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1510, 1634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1698),
+            id: DeclarationId(1712),
             name: Some("compute_ownership_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1688),
+                template: DeclarationId(1702),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1688)),
+            meta_tag: Some(DeclarationId(1702)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1704)),
+                        FieldValue::Reference(DeclarationId(1718)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1692)),
+                        FieldValue::Reference(DeclarationId(1706)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2768),
+                            constructor: DeclarationId(2788),
                             payload: vec![],
                         },
                     ),
@@ -63636,31 +64410,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1636, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1699),
+            id: DeclarationId(1713),
             name: Some("lens_complexity_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1688),
+                template: DeclarationId(1702),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1688)),
+            meta_tag: Some(DeclarationId(1702)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1705)),
+                        FieldValue::Reference(DeclarationId(1719)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1694)),
+                        FieldValue::Reference(DeclarationId(1708)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2768),
+                            constructor: DeclarationId(2788),
                             payload: vec![],
                         },
                     ),
@@ -63671,31 +64445,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1798, 1952),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1700),
+            id: DeclarationId(1714),
             name: Some("emit_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1688),
+                template: DeclarationId(1702),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1688)),
+            meta_tag: Some(DeclarationId(1702)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1706)),
+                        FieldValue::Reference(DeclarationId(1720)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1693)),
+                        FieldValue::Reference(DeclarationId(1707)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2769),
+                            constructor: DeclarationId(2789),
                             payload: vec![],
                         },
                     ),
@@ -63706,12 +64480,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1954, 2076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1701),
+            id: DeclarationId(1715),
             name: Some("parse".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230), DeclarationId(230)],
                 output: DeclarationId(828),
-                body: ArrowBody::ExternalRealization(DeclarationId(1689)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1703)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -63724,12 +64498,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2078, 2140),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1702),
+            id: DeclarationId(1716),
             name: Some("lower".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828)],
                 output: DeclarationId(828),
-                body: ArrowBody::ExternalRealization(DeclarationId(1690)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1704)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -63742,12 +64516,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2142, 2184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1703),
+            id: DeclarationId(1717),
             name: Some("infer".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828)],
                 output: DeclarationId(828),
-                body: ArrowBody::ExternalRealization(DeclarationId(1691)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1705)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -63760,12 +64534,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2186, 2228),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1704),
+            id: DeclarationId(1718),
             name: Some("compute_ownership".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828)],
                 output: DeclarationId(828),
-                body: ArrowBody::ExternalRealization(DeclarationId(1692)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1706)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -63778,12 +64552,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2230, 2288),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1705),
+            id: DeclarationId(1719),
             name: Some("lens_complexity".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828)],
                 output: DeclarationId(828),
-                body: ArrowBody::ExternalRealization(DeclarationId(1694)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1708)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -63796,17 +64570,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2290, 2347),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1706),
+            id: DeclarationId(1720),
             name: Some("emit".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
                     DeclarationId(828),
                     DeclarationId(828),
                     DeclarationId(828),
-                    DeclarationId(1051),
+                    DeclarationId(1008),
                 ],
                 output: DeclarationId(230),
-                body: ArrowBody::ExternalRealization(DeclarationId(1693)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1707)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -63819,10 +64593,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2349, 2460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1707),
+            id: DeclarationId(1721),
             name: Some("compile".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(230), DeclarationId(230), DeclarationId(1051)],
+                inputs: vec![DeclarationId(230), DeclarationId(230), DeclarationId(1008)],
                 output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/pipeline.dag",
@@ -63841,11 +64615,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2462, 2605),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1708),
+            id: DeclarationId(1722),
             name: Some("from_symbol".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
-                output: DeclarationId(2770),
+                output: DeclarationId(2790),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/operators.dag",
                     156,
@@ -63863,12 +64637,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 108, 771),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1709),
+            id: DeclarationId(1723),
             name: Some("symbol".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(806)],
                 output: DeclarationId(230),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(832))),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(864))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -63881,12 +64655,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 773, 1214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1710),
+            id: DeclarationId(1724),
             name: Some("algebra_field_name".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(806)],
                 output: DeclarationId(230),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(849))),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(881))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -63899,7 +64673,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1216, 2017),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1711),
+            id: DeclarationId(1725),
             name: Some("LensRegistryEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -63928,15 +64702,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2117, 2212),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1712),
+            id: DeclarationId(1726),
             name: Some("lens_cost_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1711),
+                template: DeclarationId(1725),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1711)),
+            meta_tag: Some(DeclarationId(1725)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -63964,15 +64738,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2214, 2387),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1713),
+            id: DeclarationId(1727),
             name: Some("lens_cost_symbolic_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1711),
+                template: DeclarationId(1725),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1711)),
+            meta_tag: Some(DeclarationId(1725)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -64000,15 +64774,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2389, 2577),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1714),
+            id: DeclarationId(1728),
             name: Some("lens_cost_target_realization_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1711),
+                template: DeclarationId(1725),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1711)),
+            meta_tag: Some(DeclarationId(1725)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -64039,15 +64813,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2579, 2816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1715),
+            id: DeclarationId(1729),
             name: Some("lens_effect_enumeration_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1711),
+                template: DeclarationId(1725),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1711)),
+            meta_tag: Some(DeclarationId(1725)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -64075,15 +64849,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2818, 3035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1716),
+            id: DeclarationId(1730),
             name: Some("lens_parallelism_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1711),
+                template: DeclarationId(1725),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1711)),
+            meta_tag: Some(DeclarationId(1725)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -64111,15 +64885,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 3037, 3226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1717),
+            id: DeclarationId(1731),
             name: Some("lens_provenance_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1711),
+                template: DeclarationId(1725),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1711)),
+            meta_tag: Some(DeclarationId(1725)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -64147,15 +64921,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 3228, 3413),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1718),
+            id: DeclarationId(1732),
             name: Some("lens_structural_resolution_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1711),
+                template: DeclarationId(1725),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1711)),
+            meta_tag: Some(DeclarationId(1725)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -64186,15 +64960,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 3415, 3644),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1719),
+            id: DeclarationId(1733),
             name: Some("lens_unused_parameters_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1711),
+                template: DeclarationId(1725),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1711)),
+            meta_tag: Some(DeclarationId(1725)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -64222,15 +64996,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 3646, 3859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1720),
+            id: DeclarationId(1734),
             name: Some("lens_infer_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1711),
+                template: DeclarationId(1725),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1711)),
+            meta_tag: Some(DeclarationId(1725)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -64258,15 +65032,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 4486, 4678),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1721),
+            id: DeclarationId(1735),
             name: Some("lens_variant_payload_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1711),
+                template: DeclarationId(1725),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1711)),
+            meta_tag: Some(DeclarationId(1725)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -64294,15 +65068,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 4680, 4880),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1722),
+            id: DeclarationId(1736),
             name: Some("lens_lower_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1711),
+                template: DeclarationId(1725),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1711)),
+            meta_tag: Some(DeclarationId(1725)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -64330,17 +65104,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 5130, 5322),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1723),
+            id: DeclarationId(1737),
             name: Some("IntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OrderedRingAlgebra".to_string(),
-                        ty: DeclarationId(2771),
+                        ty: DeclarationId(2791),
                     },
                     Field {
                         label: "SemiringAlgebra".to_string(),
-                        ty: DeclarationId(2772),
+                        ty: DeclarationId(2792),
                     },
                 ],
             },
@@ -64355,21 +65129,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6404, 6466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1724),
+            id: DeclarationId(1738),
             name: Some("NonIntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ApproximateFieldAlgebra".to_string(),
-                        ty: DeclarationId(2773),
+                        ty: DeclarationId(2793),
                     },
                     Field {
                         label: "BooleanAlgebraAlgebra".to_string(),
-                        ty: DeclarationId(2774),
+                        ty: DeclarationId(2794),
                     },
                     Field {
                         label: "TerminalAlgebra".to_string(),
-                        ty: DeclarationId(2775),
+                        ty: DeclarationId(2795),
                     },
                 ],
             },
@@ -64384,37 +65158,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6468, 6564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1725),
+            id: DeclarationId(1739),
             name: Some("TargetCarrier".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BitCarrier".to_string(),
-                        ty: DeclarationId(2776),
+                        ty: DeclarationId(2796),
                     },
                     Field {
                         label: "ByteCarrier".to_string(),
-                        ty: DeclarationId(2777),
+                        ty: DeclarationId(2797),
                     },
                     Field {
                         label: "Word16Carrier".to_string(),
-                        ty: DeclarationId(2778),
+                        ty: DeclarationId(2798),
                     },
                     Field {
                         label: "Word32Carrier".to_string(),
-                        ty: DeclarationId(2779),
+                        ty: DeclarationId(2799),
                     },
                     Field {
                         label: "Word64Carrier".to_string(),
-                        ty: DeclarationId(2780),
+                        ty: DeclarationId(2800),
                     },
                     Field {
                         label: "Word128Carrier".to_string(),
-                        ty: DeclarationId(2781),
+                        ty: DeclarationId(2801),
                     },
                     Field {
                         label: "TerminalCarrier".to_string(),
-                        ty: DeclarationId(2782),
+                        ty: DeclarationId(2802),
                     },
                 ],
             },
@@ -64429,21 +65203,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8154, 8296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1726),
+            id: DeclarationId(1740),
             name: Some("IntegerOverflow".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TwoComplementWrap".to_string(),
-                        ty: DeclarationId(2783),
+                        ty: DeclarationId(2803),
                     },
                     Field {
                         label: "Saturating".to_string(),
-                        ty: DeclarationId(2784),
+                        ty: DeclarationId(2804),
                     },
                     Field {
                         label: "Trap".to_string(),
-                        ty: DeclarationId(2785),
+                        ty: DeclarationId(2805),
                     },
                 ],
             },
@@ -64458,17 +65232,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9013, 9079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1727),
+            id: DeclarationId(1741),
             name: Some("RustPrimitive".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IntegerPrimitive".to_string(),
-                        ty: DeclarationId(2786),
+                        ty: DeclarationId(2806),
                     },
                     Field {
                         label: "NonIntegerPrimitive".to_string(),
-                        ty: DeclarationId(2787),
+                        ty: DeclarationId(2807),
                     },
                 ],
             },
@@ -64483,94 +65257,94 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9834, 10616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1728),
+            id: DeclarationId(1742),
             name: Some("rust_pilot_primitives".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1727),
+                    value: DeclarationId(1741),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2788)),
+            meta_tag: Some(DeclarationId(2808)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
                 FieldValue::Variant {
-                    constructor: DeclarationId(2786),
+                    constructor: DeclarationId(2806),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2771),
+                            constructor: DeclarationId(2791),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2777),
+                            constructor: DeclarationId(2797),
                             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(2783),
+                            constructor: DeclarationId(2803),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2786),
+                    constructor: DeclarationId(2806),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2771),
+                            constructor: DeclarationId(2791),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2778),
+                            constructor: DeclarationId(2798),
                             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(2783),
+                            constructor: DeclarationId(2803),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2786),
+                    constructor: DeclarationId(2806),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2771),
+                            constructor: DeclarationId(2791),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2779),
+                            constructor: DeclarationId(2799),
                             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(2783),
+                            constructor: DeclarationId(2803),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2786),
+                    constructor: DeclarationId(2806),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2771),
+                            constructor: DeclarationId(2791),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2780),
+                            constructor: DeclarationId(2800),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -64579,21 +65353,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         FieldValue::Literal(LiteralBits::String("9223372036854775807".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2783),
+                            constructor: DeclarationId(2803),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2786),
+                    constructor: DeclarationId(2806),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2771),
+                            constructor: DeclarationId(2791),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2781),
+                            constructor: DeclarationId(2801),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -64604,84 +65378,84 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2783),
+                            constructor: DeclarationId(2803),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2786),
+                    constructor: DeclarationId(2806),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2772),
+                            constructor: DeclarationId(2792),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2777),
+                            constructor: DeclarationId(2797),
                             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(2783),
+                            constructor: DeclarationId(2803),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2786),
+                    constructor: DeclarationId(2806),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2772),
+                            constructor: DeclarationId(2792),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2778),
+                            constructor: DeclarationId(2798),
                             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(2783),
+                            constructor: DeclarationId(2803),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2786),
+                    constructor: DeclarationId(2806),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2772),
+                            constructor: DeclarationId(2792),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2779),
+                            constructor: DeclarationId(2799),
                             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(2783),
+                            constructor: DeclarationId(2803),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2786),
+                    constructor: DeclarationId(2806),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2772),
+                            constructor: DeclarationId(2792),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2780),
+                            constructor: DeclarationId(2800),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -64690,21 +65464,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2783),
+                            constructor: DeclarationId(2803),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2786),
+                    constructor: DeclarationId(2806),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2772),
+                            constructor: DeclarationId(2792),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2781),
+                            constructor: DeclarationId(2801),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -64713,66 +65487,66 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2783),
+                            constructor: DeclarationId(2803),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2787),
+                    constructor: DeclarationId(2807),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("f32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2773),
+                            constructor: DeclarationId(2793),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2779),
+                            constructor: DeclarationId(2799),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2787),
+                    constructor: DeclarationId(2807),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("f64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2773),
+                            constructor: DeclarationId(2793),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2780),
+                            constructor: DeclarationId(2800),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2787),
+                    constructor: DeclarationId(2807),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("bool".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2774),
+                            constructor: DeclarationId(2794),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2776),
+                            constructor: DeclarationId(2796),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2787),
+                    constructor: DeclarationId(2807),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("()".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2775),
+                            constructor: DeclarationId(2795),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2782),
+                            constructor: DeclarationId(2802),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
@@ -64784,29 +65558,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10937, 15660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1729),
+            id: DeclarationId(1743),
             name: Some("CronField".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Wildcard".to_string(),
-                        ty: DeclarationId(2789),
+                        ty: DeclarationId(2809),
                     },
                     Field {
                         label: "Exact".to_string(),
-                        ty: DeclarationId(2790),
+                        ty: DeclarationId(2810),
                     },
                     Field {
                         label: "Listed".to_string(),
-                        ty: DeclarationId(2792),
+                        ty: DeclarationId(2812),
                     },
                     Field {
                         label: "Ranged".to_string(),
-                        ty: DeclarationId(2793),
+                        ty: DeclarationId(2813),
                     },
                     Field {
                         label: "Step".to_string(),
-                        ty: DeclarationId(2794),
+                        ty: DeclarationId(2814),
                     },
                 ],
             },
@@ -64821,29 +65595,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4214, 4433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1730),
+            id: DeclarationId(1744),
             name: Some("CronSchedule".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "minute".to_string(),
-                        ty: DeclarationId(1729),
+                        ty: DeclarationId(1743),
                     },
                     Field {
                         label: "hour".to_string(),
-                        ty: DeclarationId(1729),
+                        ty: DeclarationId(1743),
                     },
                     Field {
                         label: "day_of_month".to_string(),
-                        ty: DeclarationId(1729),
+                        ty: DeclarationId(1743),
                     },
                     Field {
                         label: "month".to_string(),
-                        ty: DeclarationId(1729),
+                        ty: DeclarationId(1743),
                     },
                     Field {
                         label: "day_of_week".to_string(),
-                        ty: DeclarationId(1729),
+                        ty: DeclarationId(1743),
                     },
                 ],
             },
@@ -64858,7 +65632,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4435, 4564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1731),
+            id: DeclarationId(1745),
             name: Some("CronEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64868,7 +65642,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "schedule".to_string(),
-                        ty: DeclarationId(1730),
+                        ty: DeclarationId(1744),
                     },
                     Field {
                         label: "command".to_string(),
@@ -64887,10 +65661,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4566, 4641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1732),
+            id: DeclarationId(1746),
             name: Some("render_cron_field".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1729)],
+                inputs: vec![DeclarationId(1743)],
                 output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "dsl/extdeps/cron_schedule_model.dag",
@@ -64909,10 +65683,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4643, 4963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1733),
+            id: DeclarationId(1747),
             name: Some("render_cron_schedule".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1730)],
+                inputs: vec![DeclarationId(1744)],
                 output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "dsl/extdeps/cron_schedule_model.dag",
@@ -64931,7 +65705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4965, 5253),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1734),
+            id: DeclarationId(1748),
             name: Some("wire_contract".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(312),
@@ -64952,21 +65726,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 684, 758),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1735),
+            id: DeclarationId(1749),
             name: Some("UserType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "User".to_string(),
-                        ty: DeclarationId(2795),
+                        ty: DeclarationId(2815),
                     },
                     Field {
                         label: "Bot".to_string(),
-                        ty: DeclarationId(2796),
+                        ty: DeclarationId(2816),
                     },
                     Field {
                         label: "Organization".to_string(),
-                        ty: DeclarationId(2797),
+                        ty: DeclarationId(2817),
                     },
                 ],
             },
@@ -64981,7 +65755,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 831, 872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1736),
+            id: DeclarationId(1750),
             name: Some("GitHubUser".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64995,7 +65769,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type".to_string(),
-                        ty: DeclarationId(1735),
+                        ty: DeclarationId(1749),
                     },
                 ],
             },
@@ -65010,7 +65784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 874, 936),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1737),
+            id: DeclarationId(1751),
             name: Some("Repository".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65047,7 +65821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1009, 1120),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1738),
+            id: DeclarationId(1752),
             name: Some("GitHubAuthToken".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65057,11 +65831,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "scopes".to_string(),
-                        ty: DeclarationId(2798),
+                        ty: DeclarationId(2818),
                     },
                     Field {
                         label: "expires_at".to_string(),
-                        ty: DeclarationId(2799),
+                        ty: DeclarationId(2819),
                     },
                 ],
             },
@@ -65076,29 +65850,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1193, 1286),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1739),
+            id: DeclarationId(1753),
             name: Some("GitHubScope".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ScopeRepo".to_string(),
-                        ty: DeclarationId(2800),
+                        ty: DeclarationId(2820),
                     },
                     Field {
                         label: "ScopeGist".to_string(),
-                        ty: DeclarationId(2801),
+                        ty: DeclarationId(2821),
                     },
                     Field {
                         label: "ScopeWorkflow".to_string(),
-                        ty: DeclarationId(2802),
+                        ty: DeclarationId(2822),
                     },
                     Field {
                         label: "ScopeReadOrg".to_string(),
-                        ty: DeclarationId(2803),
+                        ty: DeclarationId(2823),
                     },
                     Field {
                         label: "ScopeReadUser".to_string(),
-                        ty: DeclarationId(2804),
+                        ty: DeclarationId(2824),
                     },
                 ],
             },
@@ -65113,7 +65887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1288, 1385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1740),
+            id: DeclarationId(1754),
             name: Some("Pagination".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65123,7 +65897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "cursor".to_string(),
-                        ty: DeclarationId(2805),
+                        ty: DeclarationId(2825),
                     },
                     Field {
                         label: "has_next".to_string(),
@@ -65142,21 +65916,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1510, 1580),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1741),
+            id: DeclarationId(1755),
             name: Some("GitHubPermission".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PermRead".to_string(),
-                        ty: DeclarationId(2806),
+                        ty: DeclarationId(2826),
                     },
                     Field {
                         label: "PermWrite".to_string(),
-                        ty: DeclarationId(2807),
+                        ty: DeclarationId(2827),
                     },
                     Field {
                         label: "PermAdmin".to_string(),
-                        ty: DeclarationId(2808),
+                        ty: DeclarationId(2828),
                     },
                 ],
             },
@@ -65171,7 +65945,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1653, 1709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1742),
+            id: DeclarationId(1756),
             name: Some("default_api_base".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65190,7 +65964,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1782, 1838),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1743),
+            id: DeclarationId(1757),
             name: Some("default_per_page".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -65207,7 +65981,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1840, 1871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1744),
+            id: DeclarationId(1758),
             name: Some("max_per_page".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -65224,7 +65998,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1873, 1901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1745),
+            id: DeclarationId(1759),
             name: Some("Workflow".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65234,23 +66008,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "on".to_string(),
-                        ty: DeclarationId(2809),
+                        ty: DeclarationId(2829),
                     },
                     Field {
                         label: "concurrency".to_string(),
-                        ty: DeclarationId(2810),
+                        ty: DeclarationId(2830),
                     },
                     Field {
                         label: "jobs".to_string(),
-                        ty: DeclarationId(2811),
+                        ty: DeclarationId(2831),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2813),
+                        ty: DeclarationId(2833),
                     },
                     Field {
                         label: "permissions".to_string(),
-                        ty: DeclarationId(2814),
+                        ty: DeclarationId(2834),
                     },
                 ],
             },
@@ -65265,25 +66039,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1484, 1748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1746),
+            id: DeclarationId(1760),
             name: Some("WorkflowPermissions".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "contents".to_string(),
-                        ty: DeclarationId(1747),
+                        ty: DeclarationId(1761),
                     },
                     Field {
                         label: "pull_requests".to_string(),
-                        ty: DeclarationId(1747),
+                        ty: DeclarationId(1761),
                     },
                     Field {
                         label: "issues".to_string(),
-                        ty: DeclarationId(1747),
+                        ty: DeclarationId(1761),
                     },
                     Field {
                         label: "actions".to_string(),
-                        ty: DeclarationId(1747),
+                        ty: DeclarationId(1761),
                     },
                 ],
             },
@@ -65298,21 +66072,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1750, 1892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1747),
+            id: DeclarationId(1761),
             name: Some("PermissionLevel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PermRead".to_string(),
-                        ty: DeclarationId(2815),
+                        ty: DeclarationId(2835),
                     },
                     Field {
                         label: "PermWrite".to_string(),
-                        ty: DeclarationId(2816),
+                        ty: DeclarationId(2836),
                     },
                     Field {
                         label: "PermNone".to_string(),
-                        ty: DeclarationId(2817),
+                        ty: DeclarationId(2837),
                     },
                 ],
             },
@@ -65327,29 +66101,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1894, 1948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1748),
+            id: DeclarationId(1762),
             name: Some("WorkflowTrigger".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Push".to_string(),
-                        ty: DeclarationId(2820),
+                        ty: DeclarationId(2840),
                     },
                     Field {
                         label: "PullRequest".to_string(),
-                        ty: DeclarationId(2823),
+                        ty: DeclarationId(2843),
                     },
                     Field {
                         label: "Schedule".to_string(),
-                        ty: DeclarationId(2824),
+                        ty: DeclarationId(2844),
                     },
                     Field {
                         label: "WorkflowDispatch".to_string(),
-                        ty: DeclarationId(2826),
+                        ty: DeclarationId(2846),
                     },
                     Field {
                         label: "WorkflowCall".to_string(),
-                        ty: DeclarationId(2828),
+                        ty: DeclarationId(2848),
                     },
                 ],
             },
@@ -65364,29 +66138,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2064, 2356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1749),
+            id: DeclarationId(1763),
             name: Some("PullRequestActivity".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Opened".to_string(),
-                        ty: DeclarationId(2829),
+                        ty: DeclarationId(2849),
                     },
                     Field {
                         label: "Synchronize".to_string(),
-                        ty: DeclarationId(2830),
+                        ty: DeclarationId(2850),
                     },
                     Field {
                         label: "Reopened".to_string(),
-                        ty: DeclarationId(2831),
+                        ty: DeclarationId(2851),
                     },
                     Field {
                         label: "ReadyForReview".to_string(),
-                        ty: DeclarationId(2832),
+                        ty: DeclarationId(2852),
                     },
                     Field {
                         label: "Closed".to_string(),
-                        ty: DeclarationId(2833),
+                        ty: DeclarationId(2853),
                     },
                 ],
             },
@@ -65401,7 +66175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2358, 2452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1750),
+            id: DeclarationId(1764),
             name: Some("DispatchInput".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65411,7 +66185,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "description".to_string(),
-                        ty: DeclarationId(2834),
+                        ty: DeclarationId(2854),
                     },
                     Field {
                         label: "required".to_string(),
@@ -65419,11 +66193,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "default".to_string(),
-                        ty: DeclarationId(2835),
+                        ty: DeclarationId(2855),
                     },
                     Field {
                         label: "type".to_string(),
-                        ty: DeclarationId(1751),
+                        ty: DeclarationId(1765),
                     },
                 ],
             },
@@ -65438,25 +66212,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2454, 2576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1751),
+            id: DeclarationId(1765),
             name: Some("DispatchInputType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "InputString".to_string(),
-                        ty: DeclarationId(2836),
+                        ty: DeclarationId(2856),
                     },
                     Field {
                         label: "InputBoolean".to_string(),
-                        ty: DeclarationId(2837),
+                        ty: DeclarationId(2857),
                     },
                     Field {
                         label: "InputChoice".to_string(),
-                        ty: DeclarationId(2838),
+                        ty: DeclarationId(2858),
                     },
                     Field {
                         label: "InputEnvironment".to_string(),
-                        ty: DeclarationId(2839),
+                        ty: DeclarationId(2859),
                     },
                 ],
             },
@@ -65471,21 +66245,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2578, 2662),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1752),
+            id: DeclarationId(1766),
             name: Some("SecretScope".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "StepScope".to_string(),
-                        ty: DeclarationId(2840),
+                        ty: DeclarationId(2860),
                     },
                     Field {
                         label: "JobScope".to_string(),
-                        ty: DeclarationId(2841),
+                        ty: DeclarationId(2861),
                     },
                     Field {
                         label: "WorkflowScope".to_string(),
-                        ty: DeclarationId(2842),
+                        ty: DeclarationId(2862),
                     },
                 ],
             },
@@ -65500,7 +66274,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4765, 4820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1753),
+            id: DeclarationId(1767),
             name: Some("WorkflowSecret".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65510,7 +66284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "scope".to_string(),
-                        ty: DeclarationId(1752),
+                        ty: DeclarationId(1766),
                     },
                 ],
             },
@@ -65525,7 +66299,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5095, 5158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1754),
+            id: DeclarationId(1768),
             name: Some("Job".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65535,39 +66309,39 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(2843),
+                        ty: DeclarationId(2863),
                     },
                     Field {
                         label: "runner".to_string(),
-                        ty: DeclarationId(1758),
+                        ty: DeclarationId(1772),
                     },
                     Field {
                         label: "steps".to_string(),
-                        ty: DeclarationId(2844),
+                        ty: DeclarationId(2864),
                     },
                     Field {
                         label: "needs".to_string(),
-                        ty: DeclarationId(2845),
+                        ty: DeclarationId(2865),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2847),
+                        ty: DeclarationId(2867),
                     },
                     Field {
                         label: "outputs".to_string(),
-                        ty: DeclarationId(2849),
+                        ty: DeclarationId(2869),
                     },
                     Field {
                         label: "if_condition".to_string(),
-                        ty: DeclarationId(2850),
+                        ty: DeclarationId(2870),
                     },
                     Field {
                         label: "strategy".to_string(),
-                        ty: DeclarationId(2851),
+                        ty: DeclarationId(2871),
                     },
                     Field {
                         label: "timeout_minutes".to_string(),
-                        ty: DeclarationId(2852),
+                        ty: DeclarationId(2872),
                     },
                     Field {
                         label: "continue_on_error".to_string(),
@@ -65575,7 +66349,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "concurrency".to_string(),
-                        ty: DeclarationId(2853),
+                        ty: DeclarationId(2873),
                     },
                 ],
             },
@@ -65590,17 +66364,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5302, 5771),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1755),
+            id: DeclarationId(1769),
             name: Some("CancelInProgressSpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CancelInProgressBool".to_string(),
-                        ty: DeclarationId(2854),
+                        ty: DeclarationId(2874),
                     },
                     Field {
                         label: "CancelInProgressExpression".to_string(),
-                        ty: DeclarationId(2855),
+                        ty: DeclarationId(2875),
                     },
                 ],
             },
@@ -65615,17 +66389,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6589, 6709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1756),
+            id: DeclarationId(1770),
             name: Some("CancelInProgressWhenQueueMax".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "QueueMaxCancelInProgressFalse".to_string(),
-                        ty: DeclarationId(2856),
+                        ty: DeclarationId(2876),
                     },
                     Field {
                         label: "QueueMaxCancelInProgressExpression".to_string(),
-                        ty: DeclarationId(2857),
+                        ty: DeclarationId(2877),
                     },
                 ],
             },
@@ -65640,21 +66414,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7517, 7646),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1757),
+            id: DeclarationId(1771),
             name: Some("ConcurrencySpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ConcurrencyScalar".to_string(),
-                        ty: DeclarationId(2858),
+                        ty: DeclarationId(2878),
                     },
                     Field {
                         label: "ConcurrencyMappingQueueMax".to_string(),
-                        ty: DeclarationId(2860),
+                        ty: DeclarationId(2880),
                     },
                     Field {
                         label: "ConcurrencyMappingQueueNotMax".to_string(),
-                        ty: DeclarationId(2863),
+                        ty: DeclarationId(2883),
                     },
                 ],
             },
@@ -65669,21 +66443,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8199, 8845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1758),
+            id: DeclarationId(1772),
             name: Some("RunnerSpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "HostedRunner".to_string(),
-                        ty: DeclarationId(2864),
+                        ty: DeclarationId(2884),
                     },
                     Field {
                         label: "SelfHosted".to_string(),
-                        ty: DeclarationId(2866),
+                        ty: DeclarationId(2886),
                     },
                     Field {
                         label: "RunsOnExpression".to_string(),
-                        ty: DeclarationId(2867),
+                        ty: DeclarationId(2887),
                     },
                 ],
             },
@@ -65698,33 +66472,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10017, 10240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1759),
+            id: DeclarationId(1773),
             name: Some("RunnerLabel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UbuntuLatest".to_string(),
-                        ty: DeclarationId(2868),
+                        ty: DeclarationId(2888),
                     },
                     Field {
                         label: "Ubuntu2404".to_string(),
-                        ty: DeclarationId(2869),
+                        ty: DeclarationId(2889),
                     },
                     Field {
                         label: "Ubuntu2204".to_string(),
-                        ty: DeclarationId(2870),
+                        ty: DeclarationId(2890),
                     },
                     Field {
                         label: "MacosLatest".to_string(),
-                        ty: DeclarationId(2871),
+                        ty: DeclarationId(2891),
                     },
                     Field {
                         label: "Macos14".to_string(),
-                        ty: DeclarationId(2872),
+                        ty: DeclarationId(2892),
                     },
                     Field {
                         label: "WindowsLatest".to_string(),
-                        ty: DeclarationId(2873),
+                        ty: DeclarationId(2893),
                     },
                 ],
             },
@@ -65739,17 +66513,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10242, 10351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1760),
+            id: DeclarationId(1774),
             name: Some("Step".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "RunStep".to_string(),
-                        ty: DeclarationId(2881),
+                        ty: DeclarationId(2901),
                     },
                     Field {
                         label: "UsesStep".to_string(),
-                        ty: DeclarationId(2890),
+                        ty: DeclarationId(2910),
                     },
                 ],
             },
@@ -65764,29 +66538,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10496, 11091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1761),
+            id: DeclarationId(1775),
             name: Some("ShellType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Bash".to_string(),
-                        ty: DeclarationId(2891),
+                        ty: DeclarationId(2911),
                     },
                     Field {
                         label: "Sh".to_string(),
-                        ty: DeclarationId(2892),
+                        ty: DeclarationId(2912),
                     },
                     Field {
                         label: "Pwsh".to_string(),
-                        ty: DeclarationId(2893),
+                        ty: DeclarationId(2913),
                     },
                     Field {
                         label: "Python".to_string(),
-                        ty: DeclarationId(2894),
+                        ty: DeclarationId(2914),
                     },
                     Field {
                         label: "Cmd".to_string(),
-                        ty: DeclarationId(2895),
+                        ty: DeclarationId(2915),
                     },
                 ],
             },
@@ -65801,7 +66575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11093, 11141),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1762),
+            id: DeclarationId(1776),
             name: Some("ActionRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65830,41 +66604,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11143, 11206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1763),
+            id: DeclarationId(1777),
             name: Some("LogAnnotation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "AnnotationError".to_string(),
-                        ty: DeclarationId(2899),
+                        ty: DeclarationId(2919),
                     },
                     Field {
                         label: "AnnotationWarning".to_string(),
-                        ty: DeclarationId(2903),
+                        ty: DeclarationId(2923),
                     },
                     Field {
                         label: "AnnotationNotice".to_string(),
-                        ty: DeclarationId(2907),
+                        ty: DeclarationId(2927),
                     },
                     Field {
                         label: "AnnotationGroup".to_string(),
-                        ty: DeclarationId(2908),
+                        ty: DeclarationId(2928),
                     },
                     Field {
                         label: "AnnotationEndGroup".to_string(),
-                        ty: DeclarationId(2909),
+                        ty: DeclarationId(2929),
                     },
                     Field {
                         label: "SetOutput".to_string(),
-                        ty: DeclarationId(2910),
+                        ty: DeclarationId(2930),
                     },
                     Field {
                         label: "AddMask".to_string(),
-                        ty: DeclarationId(2911),
+                        ty: DeclarationId(2931),
                     },
                     Field {
                         label: "StopCommands".to_string(),
-                        ty: DeclarationId(2912),
+                        ty: DeclarationId(2932),
                     },
                 ],
             },
@@ -65879,7 +66653,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11440, 11867),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1764),
+            id: DeclarationId(1778),
             name: Some("annotation_error_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65898,7 +66672,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11933, 11982),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1765),
+            id: DeclarationId(1779),
             name: Some("annotation_warning_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65917,7 +66691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11983, 12036),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1766),
+            id: DeclarationId(1780),
             name: Some("annotation_notice_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65936,7 +66710,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12037, 12088),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1767),
+            id: DeclarationId(1781),
             name: Some("annotation_group_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65955,7 +66729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12089, 12139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1768),
+            id: DeclarationId(1782),
             name: Some("annotation_endgroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65974,7 +66748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12140, 12189),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1769),
+            id: DeclarationId(1783),
             name: Some("annotation_set_output_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65993,7 +66767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12190, 12254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1770),
+            id: DeclarationId(1784),
             name: Some("annotation_add_mask_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -66012,7 +66786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12255, 12311),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1771),
+            id: DeclarationId(1785),
             name: Some("annotation_stop_commands_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -66031,17 +66805,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12312, 12378),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1772),
+            id: DeclarationId(1786),
             name: Some("ArtifactOp".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Upload".to_string(),
-                        ty: DeclarationId(2914),
+                        ty: DeclarationId(2934),
                     },
                     Field {
                         label: "Download".to_string(),
-                        ty: DeclarationId(2916),
+                        ty: DeclarationId(2936),
                     },
                 ],
             },
@@ -66056,21 +66830,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12600, 12765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1773),
+            id: DeclarationId(1787),
             name: Some("MissingFilesBehavior".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Warn".to_string(),
-                        ty: DeclarationId(2917),
+                        ty: DeclarationId(2937),
                     },
                     Field {
                         label: "ErrorOut".to_string(),
-                        ty: DeclarationId(2918),
+                        ty: DeclarationId(2938),
                     },
                     Field {
                         label: "Ignore".to_string(),
-                        ty: DeclarationId(2919),
+                        ty: DeclarationId(2939),
                     },
                 ],
             },
@@ -66085,15 +66859,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12767, 12819),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1774),
+            id: DeclarationId(1788),
             name: Some("upload_artifact_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1762),
+                template: DeclarationId(1776),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1762)),
+            meta_tag: Some(DeclarationId(1776)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -66106,15 +66880,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12870, 12979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1775),
+            id: DeclarationId(1789),
             name: Some("download_artifact_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1762),
+                template: DeclarationId(1776),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1762)),
+            meta_tag: Some(DeclarationId(1776)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -66127,21 +66901,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12981, 13094),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1776),
+            id: DeclarationId(1790),
             name: Some("MatrixStrategy".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "dimensions".to_string(),
-                        ty: DeclarationId(2921),
+                        ty: DeclarationId(2941),
                     },
                     Field {
                         label: "include".to_string(),
-                        ty: DeclarationId(2923),
+                        ty: DeclarationId(2943),
                     },
                     Field {
                         label: "exclude".to_string(),
-                        ty: DeclarationId(2925),
+                        ty: DeclarationId(2945),
                     },
                     Field {
                         label: "fail_fast".to_string(),
@@ -66149,7 +66923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "max_parallel".to_string(),
-                        ty: DeclarationId(2926),
+                        ty: DeclarationId(2946),
                     },
                 ],
             },
@@ -66164,33 +66938,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13233, 13409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1777),
+            id: DeclarationId(1791),
             name: Some("CheckConclusion".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Success".to_string(),
-                        ty: DeclarationId(2927),
+                        ty: DeclarationId(2947),
                     },
                     Field {
                         label: "Failure".to_string(),
-                        ty: DeclarationId(2928),
+                        ty: DeclarationId(2948),
                     },
                     Field {
                         label: "Cancelled".to_string(),
-                        ty: DeclarationId(2929),
+                        ty: DeclarationId(2949),
                     },
                     Field {
                         label: "Skipped".to_string(),
-                        ty: DeclarationId(2930),
+                        ty: DeclarationId(2950),
                     },
                     Field {
                         label: "TimedOut".to_string(),
-                        ty: DeclarationId(2931),
+                        ty: DeclarationId(2951),
                     },
                     Field {
                         label: "ActionRequired".to_string(),
-                        ty: DeclarationId(2932),
+                        ty: DeclarationId(2952),
                     },
                 ],
             },
@@ -66205,15 +66979,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13538, 13640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1778),
+            id: DeclarationId(1792),
             name: Some("checkout_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1762),
+                template: DeclarationId(1776),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1762)),
+            meta_tag: Some(DeclarationId(1776)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -66226,15 +67000,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13766, 13861),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1779),
+            id: DeclarationId(1793),
             name: Some("setup_rust_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1762),
+                template: DeclarationId(1776),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1762)),
+            meta_tag: Some(DeclarationId(1776)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -66247,15 +67021,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13863, 13987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1780),
+            id: DeclarationId(1794),
             name: Some("cache_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1762),
+                template: DeclarationId(1776),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1762)),
+            meta_tag: Some(DeclarationId(1776)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -66268,7 +67042,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13989, 14078),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1781),
+            id: DeclarationId(1795),
             name: Some("max_job_timeout_minutes".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -66285,7 +67059,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14154, 14193),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1782),
+            id: DeclarationId(1796),
             name: Some("default_job_timeout_minutes".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -66302,7 +67076,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14195, 14238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1783),
+            id: DeclarationId(1797),
             name: Some("max_matrix_combinations".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -66319,7 +67093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14240, 14279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1784),
+            id: DeclarationId(1798),
             name: Some("github_actions_workflows_dir".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -66338,17 +67112,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1207, 1270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1785),
+            id: DeclarationId(1799),
             name: Some("GitHubActionsWorkflowExtension".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "GitHubActionsWorkflowYml".to_string(),
-                        ty: DeclarationId(2933),
+                        ty: DeclarationId(2953),
                     },
                     Field {
                         label: "GitHubActionsWorkflowYaml".to_string(),
-                        ty: DeclarationId(2934),
+                        ty: DeclarationId(2954),
                     },
                 ],
             },
@@ -66363,7 +67137,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1895, 1989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1786),
+            id: DeclarationId(1800),
             name: Some("GitHubActionsWorkflowStemSegment".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
@@ -66372,17 +67146,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(2935)),
+            refinement: Some(DeclarationId(2955)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2615, 2714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1787),
+            id: DeclarationId(1801),
             name: Some("GitHubActionsWorkflowStem".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "segment".to_string(),
-                    ty: DeclarationId(1786),
+                    ty: DeclarationId(1800),
                 }],
             },
             type_params: vec![],
@@ -66396,17 +67170,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2916, 2994),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1788),
+            id: DeclarationId(1802),
             name: Some("GitHubActionsWorkflowFileRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "stem".to_string(),
-                        ty: DeclarationId(1787),
+                        ty: DeclarationId(1801),
                     },
                     Field {
                         label: "extension".to_string(),
-                        ty: DeclarationId(1785),
+                        ty: DeclarationId(1799),
                     },
                 ],
             },
@@ -66421,7 +67195,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 3398, 3513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1789),
+            id: DeclarationId(1803),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66441,7 +67215,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3259, 3272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1790),
+            id: DeclarationId(1804),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66461,7 +67235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3421, 3434),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1791),
+            id: DeclarationId(1805),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66481,7 +67255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3439, 3452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1792),
+            id: DeclarationId(1806),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66501,7 +67275,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3556, 3569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1793),
+            id: DeclarationId(1807),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66521,7 +67295,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4162, 4169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1794),
+            id: DeclarationId(1808),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(695), DeclarationId(694)],
@@ -66539,7 +67313,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1795),
+            id: DeclarationId(1809),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66559,7 +67333,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4617, 4624),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1796),
+            id: DeclarationId(1810),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(697), DeclarationId(698)],
@@ -66577,7 +67351,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4638, 4651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1797),
+            id: DeclarationId(1811),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66597,7 +67371,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5336, 5349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1798),
+            id: DeclarationId(1812),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66617,7 +67391,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(1813),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66637,7 +67411,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5372, 5385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1800),
+            id: DeclarationId(1814),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66657,7 +67431,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5686, 5693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1801),
+            id: DeclarationId(1815),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(702)],
@@ -66675,7 +67449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5698, 5708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1802),
+            id: DeclarationId(1816),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66695,7 +67469,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5713, 5720),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1803),
+            id: DeclarationId(1817),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66715,7 +67489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5867, 5874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1804),
+            id: DeclarationId(1818),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(705)],
@@ -66733,7 +67507,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1805),
+            id: DeclarationId(1819),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66753,7 +67527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5897, 5904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1806),
+            id: DeclarationId(1820),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66773,7 +67547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6130, 6137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1807),
+            id: DeclarationId(1821),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66793,11 +67567,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6151, 6158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1808),
+            id: DeclarationId(1822),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(707)],
-                output: DeclarationId(1807),
+                output: DeclarationId(1821),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -66811,7 +67585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6142, 6158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1809),
+            id: DeclarationId(1823),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66831,7 +67605,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6163, 6170),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1810),
+            id: DeclarationId(1824),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66851,7 +67625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6356, 6363),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1811),
+            id: DeclarationId(1825),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66871,7 +67645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6588, 6595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1812),
+            id: DeclarationId(1826),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66891,7 +67665,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7202, 7209),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1813),
+            id: DeclarationId(1827),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -66911,13 +67685,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7219, 7236),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1814),
+            id: DeclarationId(1828),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1813),
+                    value: DeclarationId(1827),
                 }],
             },
             type_params: vec![],
@@ -66931,7 +67705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7214, 7237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1815),
+            id: DeclarationId(1829),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66951,7 +67725,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7415, 7422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1816),
+            id: DeclarationId(1830),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -66971,13 +67745,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7444, 7461),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1817),
+            id: DeclarationId(1831),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1816),
+                    value: DeclarationId(1830),
                 }],
             },
             type_params: vec![],
@@ -66991,7 +67765,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7439, 7462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1818),
+            id: DeclarationId(1832),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67011,7 +67785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 8177, 8184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1819),
+            id: DeclarationId(1833),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67025,7 +67799,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 2106, 2111),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1820),
+            id: DeclarationId(1834),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67045,7 +67819,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 2144, 2157),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1821),
+            id: DeclarationId(1835),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -67055,7 +67829,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "tail".to_string(),
-                        ty: DeclarationId(1820),
+                        ty: DeclarationId(1834),
                     },
                 ],
             },
@@ -67070,7 +67844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 2116, 2159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1822),
+            id: DeclarationId(1836),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67090,7 +67864,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1477, 1490),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1823),
+            id: DeclarationId(1837),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67110,7 +67884,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1570, 1583),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1824),
+            id: DeclarationId(1838),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -67129,7 +67903,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1825),
+            id: DeclarationId(1839),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -67149,7 +67923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20914, 20941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1826),
+            id: DeclarationId(1840),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -67169,7 +67943,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20993, 21024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1827),
+            id: DeclarationId(1841),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -67189,11 +67963,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21056),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1828),
+            id: DeclarationId(1842),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1827),
+                    DeclarationId(1841),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -67208,7 +67982,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1829),
+            id: DeclarationId(1843),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67228,7 +68002,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21183, 21204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1830),
+            id: DeclarationId(1844),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -67248,11 +68022,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21236),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1831),
+            id: DeclarationId(1845),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1830),
+                    DeclarationId(1844),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -67267,7 +68041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1832),
+            id: DeclarationId(1846),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67287,7 +68061,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 22266, 22287),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1833),
+            id: DeclarationId(1847),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -67306,7 +68080,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1834),
+            id: DeclarationId(1848),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -67325,7 +68099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1835),
+            id: DeclarationId(1849),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -67344,7 +68118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1836),
+            id: DeclarationId(1850),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67364,7 +68138,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 36579, 36600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1837),
+            id: DeclarationId(1851),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67384,7 +68158,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 36606, 36637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1838),
+            id: DeclarationId(1852),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67403,7 +68177,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 7532, 7561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1839),
+            id: DeclarationId(1853),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67422,7 +68196,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 7566, 7595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1840),
+            id: DeclarationId(1854),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67442,7 +68216,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 7627, 7645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1841),
+            id: DeclarationId(1855),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67462,12 +68236,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8066, 8084),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1842),
+            id: DeclarationId(1856),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1841),
+                    ty: DeclarationId(1855),
                 }],
             },
             type_params: vec![],
@@ -67481,7 +68255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8036, 8086),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1843),
+            id: DeclarationId(1857),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -67506,7 +68280,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8091, 8147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1844),
+            id: DeclarationId(1858),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67525,7 +68299,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8510, 8555),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1845),
+            id: DeclarationId(1859),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -67554,7 +68328,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8560, 8630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1846),
+            id: DeclarationId(1860),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67568,7 +68342,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14353, 14363),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1847),
+            id: DeclarationId(1861),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67587,7 +68361,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14368, 14406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1848),
+            id: DeclarationId(1862),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67606,7 +68380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14411, 14449),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1849),
+            id: DeclarationId(1863),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67625,7 +68399,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14695, 14730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1850),
+            id: DeclarationId(1864),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67639,7 +68413,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14735, 14747),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1851),
+            id: DeclarationId(1865),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67658,7 +68432,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 15169, 15198),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1852),
+            id: DeclarationId(1866),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67677,7 +68451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 15203, 15228),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1853),
+            id: DeclarationId(1867),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67691,7 +68465,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 15741, 15751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1854),
+            id: DeclarationId(1868),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67710,7 +68484,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 15756, 15794),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1855),
+            id: DeclarationId(1869),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67729,7 +68503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 16499, 16526),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1856),
+            id: DeclarationId(1870),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67748,7 +68522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 16531, 16559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1857),
+            id: DeclarationId(1871),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67768,12 +68542,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 16587, 16599),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1858),
+            id: DeclarationId(1872),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1857),
+                    ty: DeclarationId(1871),
                 }],
             },
             type_params: vec![],
@@ -67787,7 +68561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 16564, 16601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1859),
+            id: DeclarationId(1873),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67801,7 +68575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 17278, 17291),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1860),
+            id: DeclarationId(1874),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67815,7 +68589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 17296, 17310),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1861),
+            id: DeclarationId(1875),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67834,7 +68608,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 17315, 17347),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1862),
+            id: DeclarationId(1876),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67853,7 +68627,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 19517, 19558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1863),
+            id: DeclarationId(1877),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -67878,7 +68652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 19563, 19632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1864),
+            id: DeclarationId(1878),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -67915,7 +68689,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 19637, 19787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1865),
+            id: DeclarationId(1879),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67929,7 +68703,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20536, 20557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1866),
+            id: DeclarationId(1880),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -67949,12 +68723,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20588, 20615),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1867),
+            id: DeclarationId(1881),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "first_breaker".to_string(),
-                    ty: DeclarationId(1866),
+                    ty: DeclarationId(1880),
                 }],
             },
             type_params: vec![],
@@ -67968,7 +68742,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20562, 20617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1868),
+            id: DeclarationId(1882),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67988,12 +68762,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24541, 24562),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1869),
+            id: DeclarationId(1883),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "ops".to_string(),
-                    ty: DeclarationId(1868),
+                    ty: DeclarationId(1882),
                 }],
             },
             type_params: vec![],
@@ -68007,7 +68781,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24521, 24564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1870),
+            id: DeclarationId(1884),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -68027,12 +68801,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24590, 24617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1871),
+            id: DeclarationId(1885),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "arms".to_string(),
-                    ty: DeclarationId(1870),
+                    ty: DeclarationId(1884),
                 }],
             },
             type_params: vec![],
@@ -68046,7 +68820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24569, 24619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1872),
+            id: DeclarationId(1886),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68065,7 +68839,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24624, 24659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1873),
+            id: DeclarationId(1887),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -68085,12 +68859,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24691, 24723),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1874),
+            id: DeclarationId(1888),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "branches".to_string(),
-                    ty: DeclarationId(1873),
+                    ty: DeclarationId(1887),
                 }],
             },
             type_params: vec![],
@@ -68104,7 +68878,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24664, 24725),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1875),
+            id: DeclarationId(1889),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68123,7 +68897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25362, 25408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1876),
+            id: DeclarationId(1890),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68142,7 +68916,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25413, 25465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1877),
+            id: DeclarationId(1891),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68156,7 +68930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25962, 25982),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1878),
+            id: DeclarationId(1892),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68170,7 +68944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25987, 26008),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1879),
+            id: DeclarationId(1893),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68184,7 +68958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26013, 26036),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1880),
+            id: DeclarationId(1894),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68198,7 +68972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26041, 26059),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1881),
+            id: DeclarationId(1895),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68212,7 +68986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26064, 26082),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1882),
+            id: DeclarationId(1896),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68231,7 +69005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26399, 26445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1883),
+            id: DeclarationId(1897),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68250,7 +69024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26450, 26502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1884),
+            id: DeclarationId(1898),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68264,7 +69038,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 32456, 32462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1885),
+            id: DeclarationId(1899),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68283,7 +69057,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 32467, 32504),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1886),
+            id: DeclarationId(1900),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68302,7 +69076,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 32509, 32546),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1887),
+            id: DeclarationId(1901),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68316,7 +69090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 33020, 33039),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1888),
+            id: DeclarationId(1902),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68335,7 +69109,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 33044, 33093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1889),
+            id: DeclarationId(1903),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68354,7 +69128,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1890),
+            id: DeclarationId(1904),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68373,7 +69147,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1891),
+            id: DeclarationId(1905),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68392,7 +69166,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1892),
+            id: DeclarationId(1906),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68411,7 +69185,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1893),
+            id: DeclarationId(1907),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68430,7 +69204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1894),
+            id: DeclarationId(1908),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68449,12 +69223,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1895),
+            id: DeclarationId(1909),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1143),
+                template: DeclarationId(894),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1144),
+                    parameter: DeclarationId(895),
                     value: DeclarationId(723),
                 }],
             },
@@ -68469,12 +69243,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 28003, 28024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1896),
+            id: DeclarationId(1910),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1143),
+                template: DeclarationId(894),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1144),
+                    parameter: DeclarationId(895),
                     value: DeclarationId(723),
                 }],
             },
@@ -68489,7 +69263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 28088, 28109),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1897),
+            id: DeclarationId(1911),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68503,7 +69277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 754, 764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1898),
+            id: DeclarationId(1912),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68522,7 +69296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 769, 788),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1899),
+            id: DeclarationId(1913),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68536,7 +69310,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 793, 803),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1900),
+            id: DeclarationId(1914),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68555,7 +69329,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1901),
+            id: DeclarationId(1915),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68574,7 +69348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 1379, 1393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1902),
+            id: DeclarationId(1916),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68593,7 +69367,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 1398, 1411),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1903),
+            id: DeclarationId(1917),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68612,7 +69386,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 1416, 1433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1904),
+            id: DeclarationId(1918),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68631,7 +69405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3566, 3586),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1905),
+            id: DeclarationId(1919),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68650,7 +69424,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3591, 3619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1906),
+            id: DeclarationId(1920),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68669,7 +69443,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3624, 3658),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1907),
+            id: DeclarationId(1921),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68688,7 +69462,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3663, 3692),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1908),
+            id: DeclarationId(1922),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68707,7 +69481,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3697, 3714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1909),
+            id: DeclarationId(1923),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68721,7 +69495,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 4338, 4345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1910),
+            id: DeclarationId(1924),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68740,7 +69514,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 4350, 4400),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1911),
+            id: DeclarationId(1925),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68759,7 +69533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 5964, 5988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1912),
+            id: DeclarationId(1926),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68773,7 +69547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6013, 6022),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1913),
+            id: DeclarationId(1927),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68792,7 +69566,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6027, 6063),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1914),
+            id: DeclarationId(1928),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -68817,7 +69591,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6375, 6425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1915),
+            id: DeclarationId(1929),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68831,7 +69605,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6430, 6439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1916),
+            id: DeclarationId(1930),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(786),
@@ -68851,12 +69625,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7015, 7028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1917),
+            id: DeclarationId(1931),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1916),
+                    ty: DeclarationId(1930),
                 }],
             },
             type_params: vec![],
@@ -68870,7 +69644,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7003, 7029),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1918),
+            id: DeclarationId(1932),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68884,7 +69658,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7034, 7051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1919),
+            id: DeclarationId(1933),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68903,7 +69677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7302, 7312),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1920),
+            id: DeclarationId(1934),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68917,7 +69691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7317, 7326),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1921),
+            id: DeclarationId(1935),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68931,7 +69705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7331, 7340),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1922),
+            id: DeclarationId(1936),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68950,7 +69724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7767, 7787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1923),
+            id: DeclarationId(1937),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68969,7 +69743,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7792, 7816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1924),
+            id: DeclarationId(1938),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -68989,12 +69763,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7828, 7844),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1925),
+            id: DeclarationId(1939),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1924),
+                    ty: DeclarationId(1938),
                 }],
             },
             type_params: vec![],
@@ -69008,7 +69782,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7821, 7845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1926),
+            id: DeclarationId(1940),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69028,12 +69802,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7855, 7871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1927),
+            id: DeclarationId(1941),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1926),
+                    ty: DeclarationId(1940),
                 }],
             },
             type_params: vec![],
@@ -69047,7 +69821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7850, 7872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1928),
+            id: DeclarationId(1942),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69067,12 +69841,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7881, 7897),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1929),
+            id: DeclarationId(1943),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1928),
+                    ty: DeclarationId(1942),
                 }],
             },
             type_params: vec![],
@@ -69086,7 +69860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7877, 7898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1930),
+            id: DeclarationId(1944),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69106,7 +69880,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7961, 7977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1931),
+            id: DeclarationId(1945),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -69116,7 +69890,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "payload".to_string(),
-                        ty: DeclarationId(1930),
+                        ty: DeclarationId(1944),
                     },
                 ],
             },
@@ -69131,7 +69905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7903, 7983),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1932),
+            id: DeclarationId(1946),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69150,7 +69924,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9596, 9625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1933),
+            id: DeclarationId(1947),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69170,12 +69944,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9660, 9676),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1934),
+            id: DeclarationId(1948),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1933),
+                    ty: DeclarationId(1947),
                 }],
             },
             type_params: vec![],
@@ -69189,7 +69963,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9630, 9678),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1935),
+            id: DeclarationId(1949),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69208,7 +69982,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9683, 9711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1936),
+            id: DeclarationId(1950),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69228,12 +70002,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9730, 9746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1937),
+            id: DeclarationId(1951),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1936),
+                    ty: DeclarationId(1950),
                 }],
             },
             type_params: vec![],
@@ -69247,7 +70021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9716, 9747),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1938),
+            id: DeclarationId(1952),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69267,12 +70041,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9765, 9781),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1939),
+            id: DeclarationId(1953),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1938),
+                    ty: DeclarationId(1952),
                 }],
             },
             type_params: vec![],
@@ -69286,7 +70060,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9752, 9782),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1940),
+            id: DeclarationId(1954),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69305,7 +70079,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11036, 11059),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1941),
+            id: DeclarationId(1955),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69324,7 +70098,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11064, 11098),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1942),
+            id: DeclarationId(1956),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69338,7 +70112,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11103, 11110),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1943),
+            id: DeclarationId(1957),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69352,7 +70126,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11115, 11121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1944),
+            id: DeclarationId(1958),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69371,7 +70145,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11126, 11146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1945),
+            id: DeclarationId(1959),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69390,7 +70164,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11375, 11392),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1946),
+            id: DeclarationId(1960),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69410,12 +70184,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11414, 11429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1947),
+            id: DeclarationId(1961),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "children".to_string(),
-                    ty: DeclarationId(1946),
+                    ty: DeclarationId(1960),
                 }],
             },
             type_params: vec![],
@@ -69429,7 +70203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11397, 11431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1948),
+            id: DeclarationId(1962),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69449,12 +70223,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11453, 11468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1949),
+            id: DeclarationId(1963),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "variants".to_string(),
-                    ty: DeclarationId(1948),
+                    ty: DeclarationId(1962),
                 }],
             },
             type_params: vec![],
@@ -69468,7 +70242,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11436, 11470),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1950),
+            id: DeclarationId(1964),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69488,13 +70262,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11497, 11516),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1951),
+            id: DeclarationId(1965),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1950),
+                        ty: DeclarationId(1964),
                     },
                     Field {
                         label: "output".to_string(),
@@ -69517,7 +70291,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11475, 11572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1952),
+            id: DeclarationId(1966),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -69542,7 +70316,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11577, 11655),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1953),
+            id: DeclarationId(1967),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69562,7 +70336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11723, 11745),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1954),
+            id: DeclarationId(1968),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -69572,7 +70346,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "arguments".to_string(),
-                        ty: DeclarationId(1953),
+                        ty: DeclarationId(1967),
                     },
                 ],
             },
@@ -69587,7 +70361,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11660, 11751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1955),
+            id: DeclarationId(1969),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -69606,7 +70380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1956),
+            id: DeclarationId(1970),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69626,7 +70400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11852, 11871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1957),
+            id: DeclarationId(1971),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69646,7 +70420,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11890, 11912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1958),
+            id: DeclarationId(1972),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -69665,7 +70439,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1959),
+            id: DeclarationId(1973),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -69684,7 +70458,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1960),
+            id: DeclarationId(1974),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -69703,7 +70477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1961),
+            id: DeclarationId(1975),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -69722,7 +70496,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1962),
+            id: DeclarationId(1976),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69742,7 +70516,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13149, 13168),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1963),
+            id: DeclarationId(1977),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69756,7 +70530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13449, 13452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1964),
+            id: DeclarationId(1978),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69770,7 +70544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13457, 13460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1965),
+            id: DeclarationId(1979),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69784,7 +70558,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13465, 13468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1966),
+            id: DeclarationId(1980),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69798,7 +70572,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13473, 13476),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1967),
+            id: DeclarationId(1981),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69812,7 +70586,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13600, 13602),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1968),
+            id: DeclarationId(1982),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69826,7 +70600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13607, 13609),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1969),
+            id: DeclarationId(1983),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69840,7 +70614,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13614, 13616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1970),
+            id: DeclarationId(1984),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69854,7 +70628,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13621, 13623),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1971),
+            id: DeclarationId(1985),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69868,7 +70642,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13628, 13630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1972),
+            id: DeclarationId(1986),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69882,7 +70656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13635, 13637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1973),
+            id: DeclarationId(1987),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69896,7 +70670,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14414, 14417),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1974),
+            id: DeclarationId(1988),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69910,7 +70684,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14422, 14424),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1975),
+            id: DeclarationId(1989),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69929,7 +70703,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14660, 14684),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1976),
+            id: DeclarationId(1990),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69948,7 +70722,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14689, 14713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1977),
+            id: DeclarationId(1991),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69967,7 +70741,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14718, 14736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1978),
+            id: DeclarationId(1992),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69986,7 +70760,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14923, 14946),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1979),
+            id: DeclarationId(1993),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70005,7 +70779,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14951, 15007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1980),
+            id: DeclarationId(1994),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70024,7 +70798,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15012, 15066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1981),
+            id: DeclarationId(1995),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70043,7 +70817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15071, 15093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1982),
+            id: DeclarationId(1996),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -70068,7 +70842,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15218, 15270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1983),
+            id: DeclarationId(1997),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70087,7 +70861,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15275, 15305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1984),
+            id: DeclarationId(1998),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -70106,7 +70880,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1985),
+            id: DeclarationId(1999),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -70126,7 +70900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17460, 17491),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1986),
+            id: DeclarationId(2000),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(725),
@@ -70146,7 +70920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17515, 17545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1987),
+            id: DeclarationId(2001),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70165,7 +70939,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18168, 18197),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1988),
+            id: DeclarationId(2002),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -70190,7 +70964,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18202, 18249),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1989),
+            id: DeclarationId(2003),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -70209,7 +70983,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1990),
+            id: DeclarationId(2004),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70229,7 +71003,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18607, 18619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1991),
+            id: DeclarationId(2005),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70243,7 +71017,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18860, 18869),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1992),
+            id: DeclarationId(2006),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70263,7 +71037,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18927, 18943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1993),
+            id: DeclarationId(2007),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -70282,7 +71056,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1994),
+            id: DeclarationId(2008),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70296,7 +71070,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19445, 19457),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1995),
+            id: DeclarationId(2009),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70316,7 +71090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19535, 19547),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1996),
+            id: DeclarationId(2010),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -70335,7 +71109,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1997),
+            id: DeclarationId(2011),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -70354,7 +71128,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1998),
+            id: DeclarationId(2012),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70373,7 +71147,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19737, 19753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1999),
+            id: DeclarationId(2013),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70392,7 +71166,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19758, 19782),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2000),
+            id: DeclarationId(2014),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70411,7 +71185,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19787, 19805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2001),
+            id: DeclarationId(2015),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70430,7 +71204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19810, 19824),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2002),
+            id: DeclarationId(2016),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70449,7 +71223,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19829, 19843),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2003),
+            id: DeclarationId(2017),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70469,7 +71243,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19872, 19889),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2004),
+            id: DeclarationId(2018),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70489,7 +71263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19899, 19913),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2005),
+            id: DeclarationId(2019),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70509,7 +71283,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19923, 19936),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2006),
+            id: DeclarationId(2020),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70529,7 +71303,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19949, 19962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2007),
+            id: DeclarationId(2021),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70548,7 +71322,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 26045, 26063),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2008),
+            id: DeclarationId(2022),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70562,7 +71336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 26068, 26074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2009),
+            id: DeclarationId(2023),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -70582,12 +71356,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 26107, 26131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2010),
+            id: DeclarationId(2024),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "candidates".to_string(),
-                    ty: DeclarationId(2009),
+                    ty: DeclarationId(2023),
                 }],
             },
             type_params: vec![],
@@ -70601,13 +71375,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 26079, 26133),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2011),
+            id: DeclarationId(2025),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1143),
+                template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1144),
-                    value: DeclarationId(849),
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(853),
                 }],
             },
             type_params: vec![],
@@ -70618,16 +71392,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 10942, 10962),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2718, 2749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2012),
+            id: DeclarationId(2026),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1143),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1144),
-                    value: DeclarationId(849),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "content".to_string(),
+                    ty: DeclarationId(2025),
                 }],
             },
             type_params: vec![],
@@ -70638,16 +71411,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 11026, 11046),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2690, 2751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2013),
+            id: DeclarationId(2027),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(727),
+                template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(728),
-                    value: DeclarationId(849),
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(854),
                 }],
             },
             type_params: vec![],
@@ -70658,16 +71431,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 11114, 11144),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2784, 2820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2014),
+            id: DeclarationId(2028),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "content".to_string(),
+                    ty: DeclarationId(2027),
                 }],
             },
             type_params: vec![],
@@ -70678,16 +71450,40 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 11611, 11629),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2756, 2822),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2015),
+            id: DeclarationId(2029),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(727),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(728),
-                    value: DeclarationId(849),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "media_type".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "base64".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/anthropic_schema.dag", 3211, 3276),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2030),
+            name: None,
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "url".to_string(),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -70698,16 +71494,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 11635, 11665),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3281, 3305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2016),
+            id: DeclarationId(2031),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "text".to_string(),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -70718,16 +71513,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 14162, 14180),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3568, 3596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2017),
+            id: DeclarationId(2032),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(727),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(728),
-                    value: DeclarationId(849),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "source".to_string(),
+                    ty: DeclarationId(843),
                 }],
             },
             type_params: vec![],
@@ -70738,16 +71532,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 22217, 22247),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3601, 3637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2018),
+            id: DeclarationId(2033),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -70758,16 +71551,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 22252, 22270),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4332, 4354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2019),
+            id: DeclarationId(2034),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(849),
+                    value: DeclarationId(851),
                 }],
             },
             type_params: vec![],
@@ -70778,16 +71571,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 22530, 22548),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4376, 4406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2020),
+            id: DeclarationId(2035),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(2034),
                 }],
             },
             type_params: vec![],
@@ -70798,16 +71590,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 22553, 22571),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4359, 4407),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2021),
+            id: DeclarationId(2036),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
+            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", 5616, 5623),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2037),
+            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", 5749, 5761),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2038),
+            name: None,
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "text".to_string(),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -70818,16 +71637,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 23044, 23062),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5979, 6014),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2022),
+            id: DeclarationId(2039),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "source".to_string(),
+                    ty: DeclarationId(843),
                 }],
             },
             type_params: vec![],
@@ -70838,16 +71656,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 23067, 23085),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6019, 6062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2023),
+            id: DeclarationId(2040),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "source".to_string(),
+                    ty: DeclarationId(852),
                 }],
             },
             type_params: vec![],
@@ -70858,16 +71675,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 23186, 23204),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6067, 6144),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2024),
+            id: DeclarationId(2041),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(849),
+                    value: DeclarationId(850),
                 }],
             },
             type_params: vec![],
@@ -70878,18 +71695,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 23524, 23542),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6234, 6268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2025),
+            id: DeclarationId(2042),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(846),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -70898,18 +71714,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 23547, 23565),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2026),
+            id: DeclarationId(2043),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(845),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -70918,17 +71733,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 25113, 25131),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2027),
+            id: DeclarationId(2044),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
-                }],
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "source".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "title".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "content".to_string(),
+                        ty: DeclarationId(2041),
+                    },
+                    Field {
+                        label: "citations".to_string(),
+                        ty: DeclarationId(2042),
+                    },
+                    Field {
+                        label: "cache_control".to_string(),
+                        ty: DeclarationId(2043),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -70938,16 +71770,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 25384, 25402),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6149, 6364),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2028),
+            id: DeclarationId(2045),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "tool_name".to_string(),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -70958,16 +71789,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 25850, 25868),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6369, 6418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2029),
+            id: DeclarationId(2046),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "text".to_string(),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -70978,18 +71808,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 27885, 27903),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6926, 6962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2030),
+            id: DeclarationId(2047),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(847),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -70998,18 +71827,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 27933, 27951),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2031),
+            id: DeclarationId(2048),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(128),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71018,17 +71846,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 28238, 28256),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2032),
+            id: DeclarationId(2049),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
-                }],
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "tool_use_id".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "content".to_string(),
+                        ty: DeclarationId(2047),
+                    },
+                    Field {
+                        label: "is_error".to_string(),
+                        ty: DeclarationId(2048),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -71038,16 +71875,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 28284, 28302),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6967, 7085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2033),
+            id: DeclarationId(2050),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "text".to_string(),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -71058,17 +71894,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 28662, 28680),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7532, 7570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2034),
+            id: DeclarationId(2051),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
-                }],
+            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),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -71078,10 +71923,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 28685, 28703),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7575, 7658),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2035),
+            id: DeclarationId(2052),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71092,10 +71937,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 4953, 4965),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8016, 8023),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2036),
+            id: DeclarationId(2053),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71106,10 +71951,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 4970, 4986),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8028, 8037),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2037),
+            id: DeclarationId(2054),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71120,10 +71965,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 4991, 5005),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8042, 8054),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2038),
+            id: DeclarationId(2055),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71134,10 +71979,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 5855, 5868),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8059, 8066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2039),
+            id: DeclarationId(2056),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71148,10 +71993,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 5873, 5888),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8071, 8080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2040),
+            id: DeclarationId(2057),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71162,10 +72007,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 5893, 5909),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8085, 8092),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2041),
+            id: DeclarationId(2058),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71176,14 +72021,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 5914, 5927),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8097, 8123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2042),
+            id: DeclarationId(2059),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(842),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -71195,14 +72040,14 @@ 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", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2043),
+            id: DeclarationId(2060),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(843),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -71214,17 +72059,39 @@ 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", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2044),
+            id: DeclarationId(2061),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            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(2059),
+                    },
+                    Field {
+                        label: "file_id".to_string(),
+                        ty: DeclarationId(2060),
+                    },
+                    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,
@@ -71233,10 +72100,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", 8363, 8506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2045),
+            id: DeclarationId(2062),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -71252,12 +72119,17 @@ 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 {
-            id: DeclarationId(2046),
+            id: DeclarationId(2063),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71266,16 +72138,38 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 8405, 8414),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2047),
+            id: DeclarationId(2064),
             name: None,
             connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "previous".to_string(),
-                    ty: DeclarationId(848),
-                }],
+                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(2062),
+                    },
+                    Field {
+                        label: "file_id".to_string(),
+                        ty: DeclarationId(2063),
+                    },
+                    Field {
+                        label: "start_page_number".to_string(),
+                        ty: DeclarationId(93),
+                    },
+                    Field {
+                        label: "end_page_number".to_string(),
+                        ty: DeclarationId(93),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -71285,17 +72179,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 8419, 8465),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8511, 8656),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2048),
+            id: DeclarationId(2065),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(93),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71304,17 +72198,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 9506, 9523),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2049),
+            id: DeclarationId(2066),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(845),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71323,20 +72217,36 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 9528, 9552),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2050),
+            id: DeclarationId(2067),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "var".to_string(),
-                        ty: DeclarationId(845),
+                        label: "cited_text".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "degree".to_string(),
-                        ty: DeclarationId(848),
+                        label: "document_index".to_string(),
+                        ty: DeclarationId(93),
+                    },
+                    Field {
+                        label: "document_title".to_string(),
+                        ty: DeclarationId(2065),
+                    },
+                    Field {
+                        label: "file_id".to_string(),
+                        ty: DeclarationId(2066),
+                    },
+                    Field {
+                        label: "start_block_index".to_string(),
+                        ty: DeclarationId(93),
+                    },
+                    Field {
+                        label: "end_block_index".to_string(),
+                        ty: DeclarationId(93),
                     },
                 ],
             },
@@ -71348,18 +72258,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 9557, 9619),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8661, 8814),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2051),
+            id: DeclarationId(2068),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(727),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(728),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71368,16 +72277,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 9636, 9666),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2052),
+            id: DeclarationId(2069),
             name: None,
             connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(2051),
-                }],
+                children: vec![
+                    Field {
+                        label: "cited_text".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "encrypted_index".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "title".to_string(),
+                        ty: DeclarationId(2068),
+                    },
+                    Field {
+                        label: "url".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -71387,18 +72310,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 9624, 9667),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8819, 8919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2053),
+            id: DeclarationId(2070),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(727),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(728),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71407,16 +72329,38 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 9680, 9710),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2054),
+            id: DeclarationId(2071),
             name: None,
             connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(2053),
-                }],
+                children: vec![
+                    Field {
+                        label: "cited_text".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "source".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "title".to_string(),
+                        ty: DeclarationId(2070),
+                    },
+                    Field {
+                        label: "search_result_index".to_string(),
+                        ty: DeclarationId(93),
+                    },
+                    Field {
+                        label: "start_block_index".to_string(),
+                        ty: DeclarationId(93),
+                    },
+                    Field {
+                        label: "end_block_index".to_string(),
+                        ty: DeclarationId(93),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -71426,15 +72370,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 9672, 9711),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8924, 9071),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2055),
+            id: DeclarationId(2072),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(845),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(856),
                 }],
             },
             type_params: vec![],
@@ -71445,17 +72390,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 9716, 9737),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2056),
+            id: DeclarationId(2073),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(2072),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71464,17 +72409,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 9742, 9761),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2057),
+            id: DeclarationId(2074),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(31),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(32),
-                    value: DeclarationId(849),
-                }],
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "text".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "citations".to_string(),
+                        ty: DeclarationId(2073),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -71484,12 +72434,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 9479, 9501),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9650, 9732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2058),
+            id: DeclarationId(2075),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "thinking".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "signature".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71498,12 +72459,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 18143, 18156),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9737, 9798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2059),
+            id: DeclarationId(2076),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "redacted_data".to_string(),
+                    ty: DeclarationId(230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71512,12 +72478,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 18161, 18169),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9803, 9858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2060),
+            id: DeclarationId(2077),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(130),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71526,12 +72497,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 18174, 18185),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2061),
+            id: DeclarationId(2078),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            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(2077),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71540,12 +72530,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 18190, 18207),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9863, 9940),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2062),
+            id: DeclarationId(2079),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(130),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71554,16 +72549,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 18212, 18226),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2063),
+            id: DeclarationId(2080),
             name: None,
             connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "degree".to_string(),
-                    ty: DeclarationId(1221),
-                }],
+                children: vec![
+                    Field {
+                        label: "id".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "name".to_string(),
+                        ty: DeclarationId(858),
+                    },
+                    Field {
+                        label: "input".to_string(),
+                        ty: DeclarationId(130),
+                    },
+                    Field {
+                        label: "caller".to_string(),
+                        ty: DeclarationId(2079),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -71573,12 +72582,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 18231, 18280),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9945, 10045),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2064),
+            id: DeclarationId(2081),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(130),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71587,12 +72601,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 18285, 18301),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2065),
+            id: DeclarationId(2082),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "tool_use_id".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "content".to_string(),
+                        ty: DeclarationId(130),
+                    },
+                    Field {
+                        label: "caller".to_string(),
+                        ty: DeclarationId(2081),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71601,18 +72630,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 18306, 18318),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10050, 10136),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2066),
+            id: DeclarationId(2083),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(43),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(44),
-                    value: DeclarationId(865),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71621,18 +72644,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 18107, 18138),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10357, 10366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2067),
+            id: DeclarationId(2084),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(691),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(692),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71641,16 +72658,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10371, 10379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2068),
+            id: DeclarationId(2085),
             name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(728)],
-                output: DeclarationId(128),
-                body: ArrowBody::NoBody,
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71659,24 +72672,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10384, 10397),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2069),
+            id: DeclarationId(2086),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(704),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(705),
-                        value: DeclarationId(849),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(1804),
-                        value: DeclarationId(856),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71685,18 +72686,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10402, 10419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2070),
+            id: DeclarationId(2087),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(691),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(692),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71705,16 +72700,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10424, 10447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2071),
+            id: DeclarationId(2088),
             name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849), DeclarationId(849)],
-                output: DeclarationId(849),
-                body: ArrowBody::NoBody,
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71723,28 +72714,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10452, 10471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2072),
+            id: DeclarationId(2089),
             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(1794),
-                        value: DeclarationId(860),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71753,16 +72728,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10476, 10494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2073),
+            id: DeclarationId(2090),
             name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(850), DeclarationId(694)],
-                output: DeclarationId(850),
-                body: ArrowBody::NoBody,
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71771,28 +72742,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10499, 10506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2074),
+            id: DeclarationId(2091),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(693),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(695),
-                        value: DeclarationId(850),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(1794),
-                        value: DeclarationId(886),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(694),
-                        value: DeclarationId(849),
-                    },
-                ],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(93),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71801,16 +72761,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2075),
+            id: DeclarationId(2092),
             name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(850), DeclarationId(694)],
-                output: DeclarationId(850),
-                body: ArrowBody::NoBody,
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(93),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71819,28 +72780,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2076),
+            id: DeclarationId(2093),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(693),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(695),
-                        value: DeclarationId(850),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(1794),
-                        value: DeclarationId(886),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(694),
-                        value: DeclarationId(849),
-                    },
-                ],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71849,18 +72799,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2077),
+            id: DeclarationId(2094),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(689),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(690),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71869,16 +72813,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11192, 11201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2078),
+            id: DeclarationId(2095),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(689),
+                template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(690),
-                    value: DeclarationId(849),
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(857),
                 }],
             },
             type_params: vec![],
@@ -71889,18 +72833,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11687, 11725),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2079),
+            id: DeclarationId(2096),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(687),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(688),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71909,18 +72852,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2080),
+            id: DeclarationId(2097),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(689),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(690),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(130),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71929,16 +72871,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2081),
+            id: DeclarationId(2098),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(687),
+                template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(688),
-                    value: DeclarationId(849),
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(842),
                 }],
             },
             type_params: vec![],
@@ -71949,18 +72891,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147),
+            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4503, 4529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2082),
+            id: DeclarationId(2099),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(689),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(690),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(115),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71969,18 +72910,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148),
+            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2083),
+            id: DeclarationId(2100),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(687),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(688),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -71989,18 +72929,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604),
+            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2084),
+            id: DeclarationId(2101),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(689),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(690),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72009,18 +72943,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792),
+            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1013, 1025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2085),
+            id: DeclarationId(2102),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(689),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(690),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72029,18 +72957,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349),
+            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1030, 1044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2086),
+            id: DeclarationId(2103),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(687),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(688),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72049,18 +72971,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995),
+            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1049, 1064),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2087),
+            id: DeclarationId(2104),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(689),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(690),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72069,16 +72985,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201),
+            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1069, 1086),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2088),
+            id: DeclarationId(2105),
             name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(850), DeclarationId(849)],
-                output: DeclarationId(850),
-                body: ArrowBody::NoBody,
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72087,28 +72999,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
+            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1091, 1114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2089),
+            id: DeclarationId(2106),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(693),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(695),
-                        value: DeclarationId(850),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(694),
-                        value: DeclarationId(849),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(1794),
-                        value: DeclarationId(886),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72117,18 +73013,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377),
+            span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4719, 4726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2090),
+            id: DeclarationId(2107),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(689),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(690),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72137,16 +73027,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449),
+            span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4731, 4735),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2091),
+            id: DeclarationId(2108),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(687),
+                template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(688),
-                    value: DeclarationId(849),
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(869),
                 }],
             },
             type_params: vec![],
@@ -72157,46 +73047,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2092),
-            name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2034), DeclarationId(849)],
-                output: DeclarationId(2034),
-                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),
+            span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6983, 7004),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2093),
+            id: DeclarationId(2109),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(693),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(695),
-                        value: DeclarationId(2034),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(694),
-                        value: DeclarationId(849),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(1794),
-                        value: DeclarationId(889),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72205,18 +73061,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 360, 369),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2094),
+            id: DeclarationId(2110),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(893),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72225,17 +73075,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4503, 4529),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 374, 381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2095),
+            id: DeclarationId(2111),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(115),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72244,17 +73089,12 @@ 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/computation_model.dag", 614, 618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2096),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            id: DeclarationId(2112),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72263,18 +73103,12 @@ 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/computation_model.dag", 623, 632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2097),
+            id: DeclarationId(2113),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1194),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72283,18 +73117,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6546, 6561),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 910, 921),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2098),
+            id: DeclarationId(2114),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(904),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72303,17 +73131,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2718, 2749),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 926, 935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2099),
+            id: DeclarationId(2115),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "content".to_string(),
-                    ty: DeclarationId(2098),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72322,18 +73145,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2690, 2751),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 1166, 1173),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2100),
+            id: DeclarationId(2116),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(905),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72342,17 +73159,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2784, 2820),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 1178, 1187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2101),
+            id: DeclarationId(2117),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "content".to_string(),
-                    ty: DeclarationId(2100),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72361,23 +73173,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2756, 2822),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 2035, 2044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2102),
+            id: DeclarationId(2118),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "media_type".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "base64".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72386,17 +73187,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3211, 3276),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 2049, 2065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2103),
+            id: DeclarationId(2119),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "url".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72405,17 +73201,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3281, 3305),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 2070, 2080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2104),
+            id: DeclarationId(2120),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "text".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72424,17 +73215,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3568, 3596),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 2085, 2099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2105),
+            id: DeclarationId(2121),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "source".to_string(),
-                    ty: DeclarationId(894),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72443,17 +73229,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3601, 3637),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 2385, 2399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2106),
+            id: DeclarationId(2122),
             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,
@@ -72462,16 +73243,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4332, 4354),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 2404, 2418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2107),
+            id: DeclarationId(2123),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(902),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -72482,15 +73263,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4376, 4406),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 2818, 2830),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2108),
+            id: DeclarationId(2124),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(2107),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -72501,10 +73283,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", 4359, 4407),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 3210, 3222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2109),
+            id: DeclarationId(2125),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72515,10 +73297,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", 5616, 5623),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 3694, 3708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2110),
+            id: DeclarationId(2126),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72529,14 +73311,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5749, 5761),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 3713, 3729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2111),
+            id: DeclarationId(2127),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
-                    label: "text".to_string(),
+                    label: "value".to_string(),
                     ty: DeclarationId(230),
                 }],
             },
@@ -72548,17 +73330,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5979, 6014),
+            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 6759, 6786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2112),
+            id: DeclarationId(2128),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "source".to_string(),
-                    ty: DeclarationId(894),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72567,17 +73344,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6019, 6062),
+            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7611, 7616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2113),
+            id: DeclarationId(2129),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "source".to_string(),
-                    ty: DeclarationId(903),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72586,17 +73358,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6067, 6144),
+            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7621, 7630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2114),
+            id: DeclarationId(2130),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(901),
-                }],
+                template: DeclarationId(137),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(884),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(887),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -72606,17 +73384,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6234, 6268),
+            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 9513, 9555),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2115),
+            id: DeclarationId(2131),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(897),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1330),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72625,17 +73404,18 @@ 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/integer_diagnostic_order.dag", 1234, 1254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2116),
+            id: DeclarationId(2132),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(896),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1330),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72644,34 +73424,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", 6345, 6358),
+            span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1414, 1434),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2117),
+            id: DeclarationId(2133),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "source".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "title".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "content".to_string(),
-                        ty: DeclarationId(2114),
-                    },
-                    Field {
-                        label: "citations".to_string(),
-                        ty: DeclarationId(2115),
-                    },
-                    Field {
-                        label: "cache_control".to_string(),
-                        ty: DeclarationId(2116),
-                    },
-                ],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(894),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(895),
+                    value: DeclarationId(93),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -72681,15 +73444,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6149, 6364),
+            span: SourceSpan::new("src/v3/std/lookup.dag", 4589, 4600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2118),
+            id: DeclarationId(2134),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "tool_name".to_string(),
-                    ty: DeclarationId(230),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(894),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(895),
+                    value: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -72700,17 +73464,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6369, 6418),
+            span: SourceSpan::new("src/v3/std/lookup.dag", 4642, 4653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2119),
+            id: DeclarationId(2135),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "text".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72719,17 +73478,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", 6926, 6962),
+            span: SourceSpan::new("src/v3/std/lookup.dag", 4544, 4548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2120),
+            id: DeclarationId(2136),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(898),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(895),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72738,17 +73497,18 @@ 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/lookup.dag", 4553, 4563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2121),
+            id: DeclarationId(2137),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(128),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(894),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(895),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72757,26 +73517,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", 7074, 7079),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 10942, 10962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2122),
+            id: DeclarationId(2138),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "tool_use_id".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "content".to_string(),
-                        ty: DeclarationId(2120),
-                    },
-                    Field {
-                        label: "is_error".to_string(),
-                        ty: DeclarationId(2121),
-                    },
-                ],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(894),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(895),
+                    value: DeclarationId(905),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -72786,15 +73537,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6967, 7085),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 11026, 11046),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2123),
+            id: DeclarationId(2139),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "text".to_string(),
-                    ty: DeclarationId(230),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(727),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(728),
+                    value: DeclarationId(905),
                 }],
             },
             type_params: vec![],
@@ -72805,26 +73557,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", 7532, 7570),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 11114, 11144),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2124),
+            id: DeclarationId(2140),
             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),
-                    },
-                ],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -72834,12 +73577,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7575, 7658),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 11611, 11629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2125),
+            id: DeclarationId(2141),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(727),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(728),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72848,12 +73597,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8016, 8023),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 11635, 11665),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2126),
+            id: DeclarationId(2142),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72862,12 +73617,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8028, 8037),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 14162, 14180),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2127),
+            id: DeclarationId(2143),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(727),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(728),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72876,12 +73637,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8042, 8054),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 22217, 22247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2128),
+            id: DeclarationId(2144),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72890,12 +73657,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8059, 8066),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 22252, 22270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2129),
+            id: DeclarationId(2145),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72904,12 +73677,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8071, 8080),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 22530, 22548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2130),
+            id: DeclarationId(2146),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72918,12 +73697,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8085, 8092),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 22553, 22571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2131),
+            id: DeclarationId(2147),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72932,17 +73717,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8097, 8123),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 23044, 23062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2132),
+            id: DeclarationId(2148),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72951,17 +73737,18 @@ 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/algebra.dag", 23067, 23085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2133),
+            id: DeclarationId(2149),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -72970,38 +73757,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", 8453, 8460),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 23186, 23204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2134),
+            id: DeclarationId(2150),
             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(2132),
-                    },
-                    Field {
-                        label: "file_id".to_string(),
-                        ty: DeclarationId(2133),
-                    },
-                    Field {
-                        label: "start_char_index".to_string(),
-                        ty: DeclarationId(93),
-                    },
-                    Field {
-                        label: "end_char_index".to_string(),
-                        ty: DeclarationId(93),
-                    },
-                ],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -73011,17 +73777,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8363, 8506),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 23524, 23542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2135),
+            id: DeclarationId(2151),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73030,17 +73797,18 @@ 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/algebra.dag", 23547, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2136),
+            id: DeclarationId(2152),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73049,38 +73817,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", 8601, 8608),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 25113, 25131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2137),
+            id: DeclarationId(2153),
             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(2135),
-                    },
-                    Field {
-                        label: "file_id".to_string(),
-                        ty: DeclarationId(2136),
-                    },
-                    Field {
-                        label: "start_page_number".to_string(),
-                        ty: DeclarationId(93),
-                    },
-                    Field {
-                        label: "end_page_number".to_string(),
-                        ty: DeclarationId(93),
-                    },
-                ],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -73090,17 +73837,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8511, 8656),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 25384, 25402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2138),
+            id: DeclarationId(2154),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73109,17 +73857,18 @@ 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/algebra.dag", 25850, 25868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2139),
+            id: DeclarationId(2155),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73128,38 +73877,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", 8759, 8766),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 27885, 27903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2140),
+            id: DeclarationId(2156),
             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(2138),
-                    },
-                    Field {
-                        label: "file_id".to_string(),
-                        ty: DeclarationId(2139),
-                    },
-                    Field {
-                        label: "start_block_index".to_string(),
-                        ty: DeclarationId(93),
-                    },
-                    Field {
-                        label: "end_block_index".to_string(),
-                        ty: DeclarationId(93),
-                    },
-                ],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -73169,17 +73897,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8661, 8814),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 27933, 27951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2141),
+            id: DeclarationId(2157),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73188,30 +73917,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", 8897, 8904),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 28238, 28256),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2142),
+            id: DeclarationId(2158),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "cited_text".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "encrypted_index".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "title".to_string(),
-                        ty: DeclarationId(2141),
-                    },
-                    Field {
-                        label: "url".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                ],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -73221,17 +73937,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8819, 8919),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 28284, 28302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2143),
+            id: DeclarationId(2159),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73240,38 +73957,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", 8990, 8997),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 28662, 28680),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2144),
+            id: DeclarationId(2160),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "cited_text".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "source".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "title".to_string(),
-                        ty: DeclarationId(2143),
-                    },
-                    Field {
-                        label: "search_result_index".to_string(),
-                        ty: DeclarationId(93),
-                    },
-                    Field {
-                        label: "start_block_index".to_string(),
-                        ty: DeclarationId(93),
-                    },
-                    Field {
-                        label: "end_block_index".to_string(),
-                        ty: DeclarationId(93),
-                    },
-                ],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -73281,18 +73977,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8924, 9071),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 28685, 28703),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2145),
+            id: DeclarationId(2161),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(907),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73301,17 +73991,12 @@ 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, 9729),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 4953, 4965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2146),
+            id: DeclarationId(2162),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2145),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73320,23 +74005,12 @@ 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/algebra.dag", 4970, 4986),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2147),
+            id: DeclarationId(2163),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "text".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "citations".to_string(),
-                        ty: DeclarationId(2146),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73345,23 +74019,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9650, 9732),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 4991, 5005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2148),
+            id: DeclarationId(2164),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "thinking".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "signature".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73370,17 +74033,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9737, 9798),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 5855, 5868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2149),
+            id: DeclarationId(2165),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "redacted_data".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73389,17 +74047,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9803, 9858),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 5873, 5888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2150),
+            id: DeclarationId(2166),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(130),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73408,31 +74061,12 @@ 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/algebra.dag", 5893, 5909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2151),
+            id: DeclarationId(2167),
             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(2150),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73441,14 +74075,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9863, 9940),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 5914, 5927),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2152),
+            id: DeclarationId(2168),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(130),
+                    DeclarationId(898),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -73460,31 +74094,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", 10038, 10043),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2153),
+            id: DeclarationId(2169),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "id".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(909),
-                    },
-                    Field {
-                        label: "input".to_string(),
-                        ty: DeclarationId(130),
-                    },
-                    Field {
-                        label: "caller".to_string(),
-                        ty: DeclarationId(2152),
-                    },
-                ],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(899),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73493,14 +74113,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9945, 10045),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2154),
+            id: DeclarationId(2170),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(130),
+                    DeclarationId(93),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -73512,27 +74132,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", 10129, 10134),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2155),
+            id: DeclarationId(2171),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "tool_use_id".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "content".to_string(),
-                        ty: DeclarationId(130),
-                    },
-                    Field {
-                        label: "caller".to_string(),
-                        ty: DeclarationId(2154),
-                    },
-                ],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73541,10 +74151,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", 10050, 10136),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2156),
+            id: DeclarationId(2172),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73555,12 +74165,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", 10357, 10366),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 8405, 8414),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2157),
+            id: DeclarationId(2173),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "previous".to_string(),
+                    ty: DeclarationId(904),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73569,12 +74184,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", 10371, 10379),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 8419, 8465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2158),
+            id: DeclarationId(2174),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(93),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73583,12 +74203,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", 10384, 10397),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 9506, 9523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2159),
+            id: DeclarationId(2175),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(901),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73597,12 +74222,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10402, 10419),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 9528, 9552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2160),
+            id: DeclarationId(2176),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "var".to_string(),
+                        ty: DeclarationId(901),
+                    },
+                    Field {
+                        label: "degree".to_string(),
+                        ty: DeclarationId(904),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73611,12 +74247,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10424, 10447),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 9557, 9619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2161),
+            id: DeclarationId(2177),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(727),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(728),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73625,12 +74267,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", 10452, 10471),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 9636, 9666),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2162),
+            id: DeclarationId(2178),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(2177),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73639,12 +74286,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10476, 10494),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 9624, 9667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2163),
+            id: DeclarationId(2179),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(727),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(728),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73653,17 +74306,36 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10499, 10506),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 9680, 9710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2164),
+            id: DeclarationId(2180),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(2179),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: 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", 9672, 9711),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2181),
+            name: None,
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(901),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73672,17 +74344,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", 10756, 10760),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 9716, 9737),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2165),
+            id: DeclarationId(2182),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73691,17 +74363,18 @@ 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/algebra.dag", 9742, 9761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2166),
+            id: DeclarationId(2183),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(31),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(32),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73710,10 +74383,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/algebra.dag", 9479, 9501),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2167),
+            id: DeclarationId(2184),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73724,18 +74397,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11192, 11201),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 18143, 18156),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2168),
+            id: DeclarationId(2185),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(908),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73744,17 +74411,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11687, 11725),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 18161, 18169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2169),
+            id: DeclarationId(2186),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73763,17 +74425,12 @@ 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/algebra.dag", 18174, 18185),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2170),
+            id: DeclarationId(2187),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(130),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73782,10 +74439,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/algebra.dag", 18190, 18207),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2171),
+            id: DeclarationId(2188),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73796,12 +74453,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1013, 1025),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 18212, 18226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2172),
+            id: DeclarationId(2189),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "degree".to_string(),
+                    ty: DeclarationId(1148),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73810,10 +74472,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1030, 1044),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 18231, 18280),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2173),
+            id: DeclarationId(2190),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73824,10 +74486,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1049, 1064),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 18285, 18301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2174),
+            id: DeclarationId(2191),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73838,12 +74500,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1069, 1086),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 18306, 18318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2175),
+            id: DeclarationId(2192),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(43),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(44),
+                    value: DeclarationId(921),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73852,12 +74520,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1091, 1114),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 18107, 18138),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2176),
+            id: DeclarationId(2193),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(691),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(692),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73866,12 +74540,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4719, 4726),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2177),
+            id: DeclarationId(2194),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(728)],
+                output: DeclarationId(128),
+                body: ArrowBody::NoBody,
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73880,17 +74558,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4731, 4735),
+            span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2178),
+            id: DeclarationId(2195),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(919),
-                }],
+                template: DeclarationId(704),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(705),
+                        value: DeclarationId(905),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1818),
+                        value: DeclarationId(912),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -73900,12 +74584,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6983, 7004),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2179),
+            id: DeclarationId(2196),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(691),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(692),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73914,12 +74604,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 2224, 2238),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2180),
+            id: DeclarationId(2197),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(905), DeclarationId(905)],
+                output: DeclarationId(905),
+                body: ArrowBody::NoBody,
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73928,12 +74622,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 2243, 2268),
+            span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2181),
+            id: DeclarationId(2198),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(693),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(695),
+                        value: DeclarationId(905),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(694),
+                        value: DeclarationId(905),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1808),
+                        value: DeclarationId(916),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73942,12 +74652,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 2273, 2283),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2182),
+            id: DeclarationId(2199),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(906), DeclarationId(694)],
+                output: DeclarationId(906),
+                body: ArrowBody::NoBody,
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73956,12 +74670,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 2548, 2565),
+            span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2183),
+            id: DeclarationId(2200),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(693),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(695),
+                        value: DeclarationId(906),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1808),
+                        value: DeclarationId(942),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(694),
+                        value: DeclarationId(905),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73970,12 +74700,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 2570, 2594),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2184),
+            id: DeclarationId(2201),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(906), DeclarationId(694)],
+                output: DeclarationId(906),
+                body: ArrowBody::NoBody,
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73984,12 +74718,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 2599, 2631),
+            span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2185),
+            id: DeclarationId(2202),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(693),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(695),
+                        value: DeclarationId(906),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1808),
+                        value: DeclarationId(942),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(694),
+                        value: DeclarationId(905),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -73998,12 +74748,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 2636, 2663),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2186),
+            id: DeclarationId(2203),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(689),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(690),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -74012,12 +74768,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3369, 3393),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2187),
+            id: DeclarationId(2204),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(689),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(690),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -74026,12 +74788,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3398, 3430),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2188),
+            id: DeclarationId(2205),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(687),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(688),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -74040,12 +74808,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3564, 3588),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2189),
+            id: DeclarationId(2206),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(689),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(690),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -74054,12 +74828,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3593, 3614),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2190),
+            id: DeclarationId(2207),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(687),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(688),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -74068,12 +74848,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3619, 3637),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2191),
+            id: DeclarationId(2208),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(689),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(690),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -74082,12 +74868,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3781, 3796),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2192),
+            id: DeclarationId(2209),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(687),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(688),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -74096,12 +74888,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3801, 3831),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2193),
+            id: DeclarationId(2210),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(689),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(690),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -74110,12 +74908,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3836, 3857),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2194),
+            id: DeclarationId(2211),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(689),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(690),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -74124,12 +74928,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 4024, 4044),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2195),
+            id: DeclarationId(2212),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(687),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(688),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -74138,12 +74948,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 4049, 4076),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2196),
+            id: DeclarationId(2213),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(689),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(690),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -74152,12 +74968,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 4081, 4095),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2197),
+            id: DeclarationId(2214),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(906), DeclarationId(905)],
+                output: DeclarationId(906),
+                body: ArrowBody::NoBody,
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -74166,12 +74986,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 4354, 4362),
+            span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2198),
+            id: DeclarationId(2215),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(693),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(695),
+                        value: DeclarationId(906),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(694),
+                        value: DeclarationId(905),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1808),
+                        value: DeclarationId(942),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -74180,12 +75016,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 4367, 4393),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2199),
+            id: DeclarationId(2216),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(689),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(690),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -74194,16 +75036,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 4398, 4423),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2200),
+            id: DeclarationId(2217),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
+                template: DeclarationId(687),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(230),
+                    parameter: DeclarationId(688),
+                    value: DeclarationId(905),
                 }],
             },
             type_params: vec![],
@@ -74214,12 +75056,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 5320, 5332),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2201),
+            id: DeclarationId(2218),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(2160), DeclarationId(905)],
+                output: DeclarationId(2160),
+                body: ArrowBody::NoBody,
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -74228,12 +75074,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 5693, 5713),
+            span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2202),
+            id: DeclarationId(2219),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(693),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(695),
+                        value: DeclarationId(2160),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(694),
+                        value: DeclarationId(905),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1808),
+                        value: DeclarationId(945),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -74242,12 +75104,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 5718, 5736),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2203),
+            id: DeclarationId(2220),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(137),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(949),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -74256,12 +75130,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 5741, 5759),
+            span: SourceSpan::new("src/v3/std/services.dag", 6784, 6807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2204),
+            id: DeclarationId(2221),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(952),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -74270,14 +75150,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 5764, 5791),
+            span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6546, 6561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2205),
+            id: DeclarationId(2222),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(935),
+                    DeclarationId(956),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -74292,7 +75172,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2206),
+            id: DeclarationId(2223),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -74311,7 +75191,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2207),
+            id: DeclarationId(2224),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -74330,7 +75210,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2208),
+            id: DeclarationId(2225),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -74349,11 +75229,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2209),
+            id: DeclarationId(2226),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(946),
+                    DeclarationId(967),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -74368,11 +75248,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2210),
+            id: DeclarationId(2227),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(946),
+                    DeclarationId(967),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -74387,7 +75267,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2211),
+            id: DeclarationId(2228),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74406,7 +75286,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1430, 1462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2212),
+            id: DeclarationId(2229),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74425,7 +75305,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1467, 1503),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2213),
+            id: DeclarationId(2230),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74444,7 +75324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1508, 1545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2214),
+            id: DeclarationId(2231),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74463,7 +75343,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1550, 1576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2215),
+            id: DeclarationId(2232),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74482,7 +75362,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1581, 1614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2216),
+            id: DeclarationId(2233),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74496,12 +75376,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1619, 1636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2217),
+            id: DeclarationId(2234),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "steps".to_string(),
-                    ty: DeclarationId(1221),
+                    ty: DeclarationId(1148),
                 }],
             },
             type_params: vec![],
@@ -74515,7 +75395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1641, 1695),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2218),
+            id: DeclarationId(2235),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74529,7 +75409,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1700, 1707),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2219),
+            id: DeclarationId(2236),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74548,13 +75428,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2059, 2097),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2220),
+            id: DeclarationId(2237),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "amount".to_string(),
-                        ty: DeclarationId(1221),
+                        ty: DeclarationId(1148),
                     },
                     Field {
                         label: "collection".to_string(),
@@ -74573,13 +75453,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2102, 2176),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2221),
+            id: DeclarationId(2238),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "steps".to_string(),
-                        ty: DeclarationId(1221),
+                        ty: DeclarationId(1148),
                     },
                     Field {
                         label: "ring_param".to_string(),
@@ -74598,13 +75478,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2181, 2256),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2222),
+            id: DeclarationId(2239),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "divisor".to_string(),
-                        ty: DeclarationId(1223),
+                        ty: DeclarationId(1150),
                     },
                     Field {
                         label: "ring_param".to_string(),
@@ -74623,7 +75503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2261, 2334),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2223),
+            id: DeclarationId(2240),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74642,7 +75522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2339, 2376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2224),
+            id: DeclarationId(2241),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74661,7 +75541,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2381, 2418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2225),
+            id: DeclarationId(2242),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74680,7 +75560,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2423, 2464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2226),
+            id: DeclarationId(2243),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74694,7 +75574,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2469, 2485),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2227),
+            id: DeclarationId(2244),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74708,12 +75588,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3221, 3231),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2228),
+            id: DeclarationId(2245),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "steps".to_string(),
-                    ty: DeclarationId(1221),
+                    ty: DeclarationId(1148),
                 }],
             },
             type_params: vec![],
@@ -74727,12 +75607,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3236, 3283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2229),
+            id: DeclarationId(2246),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "divisor".to_string(),
-                    ty: DeclarationId(1223),
+                    ty: DeclarationId(1150),
                 }],
             },
             type_params: vec![],
@@ -74746,7 +75626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3288, 3339),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2230),
+            id: DeclarationId(2247),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74760,7 +75640,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3529, 3533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2231),
+            id: DeclarationId(2248),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74774,7 +75654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3538, 3545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2232),
+            id: DeclarationId(2249),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74788,11 +75668,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3550, 3556),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2233),
+            id: DeclarationId(2250),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(938),
+                    DeclarationId(959),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -74807,7 +75687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2234),
+            id: DeclarationId(2251),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74821,7 +75701,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7493, 7504),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2235),
+            id: DeclarationId(2252),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74835,7 +75715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7553, 7567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2236),
+            id: DeclarationId(2253),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74849,7 +75729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7632, 7648),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2237),
+            id: DeclarationId(2254),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74860,12 +75740,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 360, 369),
+            span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3709, 3721),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2238),
+            id: DeclarationId(2255),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "value".to_string(),
+                    ty: DeclarationId(159),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -74874,12 +75759,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 374, 381),
+            span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3726, 3762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2239),
+            id: DeclarationId(2256),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(976),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -74888,10 +75779,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 614, 618),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 855, 873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2240),
+            id: DeclarationId(2257),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74902,12 +75793,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 623, 632),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 4373, 4389),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2241),
+            id: DeclarationId(2258),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(788),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -74916,10 +75812,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 910, 921),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 4394, 4422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2242),
+            id: DeclarationId(2259),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74930,12 +75826,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 926, 935),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 4665, 4686),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2243),
+            id: DeclarationId(2260),
             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,
@@ -74944,12 +75845,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 1166, 1173),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 5176, 5195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2244),
+            id: DeclarationId(2261),
             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,
@@ -74958,12 +75864,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 1178, 1187),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 5200, 5222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2245),
+            id: DeclarationId(2262),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(981),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -74972,10 +75884,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 2035, 2044),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 5591, 5614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2246),
+            id: DeclarationId(2263),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74986,10 +75898,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 2049, 2065),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 6611, 6619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2247),
+            id: DeclarationId(2264),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75000,10 +75912,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 2070, 2080),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 6624, 6632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2248),
+            id: DeclarationId(2265),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75014,10 +75926,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 2085, 2099),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 7073, 7078),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2249),
+            id: DeclarationId(2266),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75028,10 +75940,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 2385, 2399),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 7083, 7091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2250),
+            id: DeclarationId(2267),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75042,50 +75954,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 2404, 2418),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2251),
-            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),
-                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", 3210, 3222),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 7427, 7440),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2253),
+            id: DeclarationId(2268),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75096,10 +75968,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 3694, 3708),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 7445, 7451),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2254),
+            id: DeclarationId(2269),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75110,17 +75982,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 3713, 3729),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 7709, 7717),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2255),
+            id: DeclarationId(2270),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "value".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -75129,10 +75996,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 6759, 6786),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 7722, 7727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2256),
+            id: DeclarationId(2271),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75143,10 +76010,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7611, 7616),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 7732, 7745),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2257),
+            id: DeclarationId(2272),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75157,24 +76024,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7621, 7630),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 8082, 8100),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2258),
+            id: DeclarationId(2273),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(137),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(138),
-                        value: DeclarationId(962),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(139),
-                        value: DeclarationId(965),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -75183,10 +76038,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 9513, 9555),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 9475, 9484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2259),
+            id: DeclarationId(2274),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75197,10 +76052,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3853, 3857),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 9489, 9502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2260),
+            id: DeclarationId(2275),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75211,10 +76066,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3860, 3864),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 9507, 9515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2261),
+            id: DeclarationId(2276),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75225,10 +76080,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3867, 3871),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 9520, 9530),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2262),
+            id: DeclarationId(2277),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75239,10 +76094,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3874, 3879),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 9535, 9545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2263),
+            id: DeclarationId(2278),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75253,10 +76108,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3882, 3893),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 9550, 9561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2264),
+            id: DeclarationId(2279),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75267,10 +76122,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3896, 3909),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 9566, 9574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2265),
+            id: DeclarationId(2280),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75281,10 +76136,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4489, 4494),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 9579, 9586),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2266),
+            id: DeclarationId(2281),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75295,10 +76150,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4497, 4506),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 9591, 9601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2267),
+            id: DeclarationId(2282),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75309,10 +76164,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4509, 4515),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 9606, 9618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2268),
+            id: DeclarationId(2283),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75323,10 +76178,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4518, 4522),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 12311, 12337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2269),
+            id: DeclarationId(2284),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75337,18 +76192,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4525, 4529),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 12342, 12352),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2270),
+            id: DeclarationId(2285),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(974),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -75357,18 +76206,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5923, 5941),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 17117, 17123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2271),
+            id: DeclarationId(2286),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(975),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -75377,10 +76220,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6396, 6424),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 17128, 17139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2272),
+            id: DeclarationId(2287),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75391,10 +76234,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1099, 1113),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 17459, 17470),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2273),
+            id: DeclarationId(2288),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75405,10 +76248,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1118, 1128),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 17475, 17486),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2274),
+            id: DeclarationId(2289),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75419,10 +76262,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1133, 1145),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 19419, 19430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2275),
+            id: DeclarationId(2290),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75433,12 +76276,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1150, 1163),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 19435, 19443),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2276),
+            id: DeclarationId(2291),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "template".to_string(),
+                    ty: DeclarationId(230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -75447,12 +76295,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1168, 1180),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 20606, 20641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2277),
+            id: DeclarationId(2292),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "inline_template".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "fn_ref_template".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -75461,10 +76320,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1185, 1197),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 20646, 20734),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2278),
+            id: DeclarationId(2293),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75475,10 +76334,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1202, 1224),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 2224, 2238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2279),
+            id: DeclarationId(2294),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75489,10 +76348,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1229, 1248),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 2243, 2268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2280),
+            id: DeclarationId(2295),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75503,10 +76362,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1253, 1278),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 2273, 2283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2281),
+            id: DeclarationId(2296),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75517,17 +76376,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1283, 1306),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 2548, 2565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2282),
+            id: DeclarationId(2297),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(977),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -75536,17 +76390,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5506, 5542),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 2570, 2594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2283),
+            id: DeclarationId(2298),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(980),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -75555,18 +76404,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5547, 5588),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 2599, 2631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2284),
+            id: DeclarationId(2299),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(978),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -75575,17 +76418,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 6047, 6063),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 2636, 2663),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2285),
+            id: DeclarationId(2300),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "unspecified_axis".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -75594,10 +76432,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9175, 9216),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3369, 3393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2286),
+            id: DeclarationId(2301),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75608,18 +76446,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9513, 9525),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3398, 3430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2287),
+            id: DeclarationId(2302),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -75628,23 +76460,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9795, 9807),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3564, 3588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2288),
+            id: DeclarationId(2303),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "binding".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "sites".to_string(),
-                        ty: DeclarationId(2287),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -75653,17 +76474,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9752, 9809),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3593, 3614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2289),
+            id: DeclarationId(2304),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "construct".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -75672,17 +76488,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10119, 10153),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3619, 3637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2290),
+            id: DeclarationId(2305),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "detail".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -75691,10 +76502,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10556, 10607),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3781, 3796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2291),
+            id: DeclarationId(2306),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75705,27 +76516,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10950, 10968),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3801, 3831),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2292),
+            id: DeclarationId(2307),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "connective".to_string(),
-                        ty: DeclarationId(971),
-                    },
-                    Field {
-                        label: "behavior".to_string(),
-                        ty: DeclarationId(972),
-                    },
-                    Field {
-                        label: "target".to_string(),
-                        ty: DeclarationId(967),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -75734,18 +76530,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 11357, 11469),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3836, 3857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2293),
+            id: DeclarationId(2308),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(37),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(38),
-                    value: DeclarationId(1003),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -75754,24 +76544,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4846, 4866),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 4024, 4044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2294),
+            id: DeclarationId(2309),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1002),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1003),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -75780,24 +76558,12 @@ 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/clean_emission.dag", 4049, 4076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2295),
+            id: DeclarationId(2310),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1002),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1003),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -75806,24 +76572,12 @@ 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/clean_emission.dag", 4081, 4095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2296),
+            id: DeclarationId(2311),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1002),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1003),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -75832,18 +76586,12 @@ 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/clean_emission.dag", 4354, 4362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2297),
+            id: DeclarationId(2312),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(37),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(38),
-                    value: DeclarationId(1006),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -75852,24 +76600,12 @@ 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/clean_emission.dag", 4367, 4393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2298),
+            id: DeclarationId(2313),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1005),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1006),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -75878,23 +76614,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 5072, 5096),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 4398, 4423),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2299),
+            id: DeclarationId(2314),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1005),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1006),
-                    },
-                ],
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(230),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -75904,24 +76634,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 5107, 5131),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 5320, 5332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2300),
+            id: DeclarationId(2315),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1005),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1006),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -75930,18 +76648,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 5137, 5161),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 5693, 5713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2301),
+            id: DeclarationId(2316),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(37),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(38),
-                    value: DeclarationId(1009),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -75950,24 +76662,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 5245, 5265),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 5718, 5736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2302),
+            id: DeclarationId(2317),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1008),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1009),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -75976,24 +76676,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 5276, 5300),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 5741, 5759),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2303),
+            id: DeclarationId(2318),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1008),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1009),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76002,18 +76690,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 5325, 5349),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 5764, 5791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2304),
+            id: DeclarationId(2319),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(37),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(38),
-                    value: DeclarationId(1012),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76022,24 +76704,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 5440, 5460),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3853, 3857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2305),
+            id: DeclarationId(2320),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1011),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1012),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76048,24 +76718,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 5471, 5495),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3860, 3864),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2306),
+            id: DeclarationId(2321),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1011),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1012),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76074,17 +76732,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 5520, 5544),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3867, 3871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2307),
+            id: DeclarationId(2322),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(985),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76093,23 +76746,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 1634, 1651),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3874, 3879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2308),
+            id: DeclarationId(2323),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "reason".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "at".to_string(),
-                        ty: DeclarationId(827),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76118,10 +76760,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 1656, 1697),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3882, 3893),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2309),
+            id: DeclarationId(2324),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76132,17 +76774,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 1879, 1891),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3896, 3909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2310),
+            id: DeclarationId(2325),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "value".to_string(),
-                    ty: DeclarationId(982),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76151,18 +76788,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 1896, 1932),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4489, 4494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2311),
+            id: DeclarationId(2326),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(988),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76171,18 +76802,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 2414, 2430),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4497, 4506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2312),
+            id: DeclarationId(2327),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(2311),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76191,27 +76816,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 2409, 2431),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4509, 4515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2313),
+            id: DeclarationId(2328),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "dimension_name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "composed".to_string(),
-                        ty: DeclarationId(988),
-                    },
-                    Field {
-                        label: "witnesses".to_string(),
-                        ty: DeclarationId(2312),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76220,18 +76830,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 2325, 2437),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4518, 4522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2314),
+            id: DeclarationId(2329),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(982),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76240,16 +76844,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 2505, 2521),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4525, 4529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2315),
+            id: DeclarationId(2330),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(988),
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1031),
                 }],
             },
             type_params: vec![],
@@ -76260,16 +76864,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 2544, 2560),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5923, 5941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2316),
+            id: DeclarationId(2331),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2315),
+                    value: DeclarationId(1032),
                 }],
             },
             type_params: vec![],
@@ -76280,27 +76884,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 2539, 2561),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6396, 6424),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2317),
+            id: DeclarationId(2332),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "dimension_name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "violations".to_string(),
-                        ty: DeclarationId(2314),
-                    },
-                    Field {
-                        label: "witnesses".to_string(),
-                        ty: DeclarationId(2316),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76309,18 +76898,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 2442, 2567),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1099, 1113),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2318),
+            id: DeclarationId(2333),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(990),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76329,16 +76912,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 3902, 3918),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1118, 1128),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2319),
+            id: DeclarationId(2334),
             name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2318),
-                body: ArrowBody::NoBody,
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76347,18 +76926,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 3881, 3918),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1133, 1145),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2320),
+            id: DeclarationId(2335),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(19),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(20),
-                    value: DeclarationId(990),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76367,16 +76940,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 3930, 3945),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1150, 1163),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2321),
+            id: DeclarationId(2336),
             name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(827), DeclarationId(990)],
-                output: DeclarationId(986),
-                body: ArrowBody::NoBody,
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76385,18 +76954,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 3966, 4009),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1168, 1180),
         });
-        declarations.push(Declaration {
-            id: DeclarationId(2322),
-            name: Some("DimensionUnitAbelianGroup".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(25),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(26),
-                    value: DeclarationId(992),
-                }],
-            },
+        declarations.push(Declaration {
+            id: DeclarationId(2337),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76405,10 +76968,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1185, 1197),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2323),
+            id: DeclarationId(2338),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76419,17 +76982,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3709, 3721),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1202, 1224),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2324),
+            id: DeclarationId(2339),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "value".to_string(),
-                    ty: DeclarationId(159),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76438,18 +76996,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3726, 3762),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1229, 1248),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2325),
+            id: DeclarationId(2340),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1019),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76458,10 +77010,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 855, 873),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1253, 1278),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2326),
+            id: DeclarationId(2341),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76472,15 +77024,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 4373, 4389),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1283, 1306),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2327),
+            id: DeclarationId(2342),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(788),
+                    ty: DeclarationId(1034),
                 }],
             },
             type_params: vec![],
@@ -76491,12 +77043,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 4394, 4422),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5506, 5542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2328),
+            id: DeclarationId(2343),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(1037),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76505,15 +77062,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 4665, 4686),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5547, 5588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2329),
+            id: DeclarationId(2344),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1035),
                 }],
             },
             type_params: vec![],
@@ -76524,14 +77082,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 5176, 5195),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 6047, 6063),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2330),
+            id: DeclarationId(2345),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
-                    label: "_0".to_string(),
+                    label: "unspecified_axis".to_string(),
                     ty: DeclarationId(230),
                 }],
             },
@@ -76543,16 +77101,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 5200, 5222),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9175, 9216),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2331),
+            id: DeclarationId(2346),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9513, 9525),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2347),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1024),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -76563,12 +77135,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 5591, 5614),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9795, 9807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2332),
+            id: DeclarationId(2348),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "binding".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "sites".to_string(),
+                        ty: DeclarationId(2347),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76577,12 +77160,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 6611, 6619),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9752, 9809),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2333),
+            id: DeclarationId(2349),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "construct".to_string(),
+                    ty: DeclarationId(230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76591,12 +77179,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 6624, 6632),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10119, 10153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2334),
+            id: DeclarationId(2350),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "detail".to_string(),
+                    ty: DeclarationId(230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76605,10 +77198,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 7073, 7078),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10556, 10607),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2335),
+            id: DeclarationId(2351),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76619,12 +77212,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 7083, 7091),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10950, 10968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2336),
+            id: DeclarationId(2352),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "connective".to_string(),
+                        ty: DeclarationId(1028),
+                    },
+                    Field {
+                        label: "behavior".to_string(),
+                        ty: DeclarationId(1029),
+                    },
+                    Field {
+                        label: "target".to_string(),
+                        ty: DeclarationId(1024),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76633,12 +77241,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 7427, 7440),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 11357, 11469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2337),
+            id: DeclarationId(2353),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(37),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(38),
+                    value: DeclarationId(1060),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76647,12 +77261,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 7445, 7451),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4846, 4866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2338),
+            id: DeclarationId(2354),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1048),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1049),
+                        value: DeclarationId(1059),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1050),
+                        value: DeclarationId(1060),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76661,12 +77287,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 7709, 7717),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4876, 4900),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2339),
+            id: DeclarationId(2355),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1048),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1049),
+                        value: DeclarationId(1059),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1050),
+                        value: DeclarationId(1060),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76675,12 +77313,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 7722, 7727),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4911, 4935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2340),
+            id: DeclarationId(2356),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1048),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1049),
+                        value: DeclarationId(1059),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1050),
+                        value: DeclarationId(1060),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76689,12 +77339,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 7732, 7745),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4941, 4965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2341),
+            id: DeclarationId(2357),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(37),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(38),
+                    value: DeclarationId(1063),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76703,12 +77359,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 8082, 8100),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5042, 5062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2342),
+            id: DeclarationId(2358),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1048),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1049),
+                        value: DeclarationId(1062),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1050),
+                        value: DeclarationId(1063),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76717,12 +77385,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 9475, 9484),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5072, 5096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2343),
+            id: DeclarationId(2359),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1048),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1049),
+                        value: DeclarationId(1062),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1050),
+                        value: DeclarationId(1063),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76731,12 +77411,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 9489, 9502),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5107, 5131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2344),
+            id: DeclarationId(2360),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1048),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1049),
+                        value: DeclarationId(1062),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1050),
+                        value: DeclarationId(1063),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76745,12 +77437,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 9507, 9515),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5137, 5161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2345),
+            id: DeclarationId(2361),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(37),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(38),
+                    value: DeclarationId(1066),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76759,12 +77457,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 9520, 9530),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5245, 5265),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2346),
+            id: DeclarationId(2362),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1048),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1049),
+                        value: DeclarationId(1065),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1050),
+                        value: DeclarationId(1066),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76773,12 +77483,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 9535, 9545),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5276, 5300),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2347),
+            id: DeclarationId(2363),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1048),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1049),
+                        value: DeclarationId(1065),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1050),
+                        value: DeclarationId(1066),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76787,12 +77509,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 9550, 9561),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5325, 5349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2348),
+            id: DeclarationId(2364),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(37),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(38),
+                    value: DeclarationId(1069),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76801,12 +77529,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 9566, 9574),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5440, 5460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2349),
+            id: DeclarationId(2365),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1048),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1049),
+                        value: DeclarationId(1068),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1050),
+                        value: DeclarationId(1069),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76815,12 +77555,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 9579, 9586),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5471, 5495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2350),
+            id: DeclarationId(2366),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1048),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1049),
+                        value: DeclarationId(1068),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1050),
+                        value: DeclarationId(1069),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76829,12 +77581,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 9591, 9601),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5520, 5544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2351),
+            id: DeclarationId(2367),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(1042),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76843,12 +77600,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 9606, 9618),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 1634, 1651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2352),
+            id: DeclarationId(2368),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "reason".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "at".to_string(),
+                        ty: DeclarationId(827),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76857,10 +77625,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 12311, 12337),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 1656, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2353),
+            id: DeclarationId(2369),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76871,12 +77639,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 12342, 12352),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 1879, 1891),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2354),
+            id: DeclarationId(2370),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "value".to_string(),
+                    ty: DeclarationId(1039),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76885,12 +77658,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 17117, 17123),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 1896, 1932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2355),
+            id: DeclarationId(2371),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1041),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1045),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76899,12 +77678,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 17128, 17139),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 2414, 2430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2356),
+            id: DeclarationId(2372),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(2371),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76913,12 +77698,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 17459, 17470),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 2409, 2431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2357),
+            id: DeclarationId(2373),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "dimension_name".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "composed".to_string(),
+                        ty: DeclarationId(1045),
+                    },
+                    Field {
+                        label: "witnesses".to_string(),
+                        ty: DeclarationId(2372),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76927,12 +77727,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 17475, 17486),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 2325, 2437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2358),
+            id: DeclarationId(2374),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1039),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76941,12 +77747,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 19419, 19430),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 2505, 2521),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2359),
+            id: DeclarationId(2375),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1041),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1045),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -76955,15 +77767,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 19435, 19443),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 2544, 2560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2360),
+            id: DeclarationId(2376),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "template".to_string(),
-                    ty: DeclarationId(230),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(2375),
                 }],
             },
             type_params: vec![],
@@ -76974,20 +77787,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 20606, 20641),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 2539, 2561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2361),
+            id: DeclarationId(2377),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "inline_template".to_string(),
+                        label: "dimension_name".to_string(),
                         ty: DeclarationId(230),
                     },
                     Field {
-                        label: "fn_ref_template".to_string(),
-                        ty: DeclarationId(230),
+                        label: "violations".to_string(),
+                        ty: DeclarationId(2374),
+                    },
+                    Field {
+                        label: "witnesses".to_string(),
+                        ty: DeclarationId(2376),
                     },
                 ],
             },
@@ -76999,16 +77816,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 20646, 20734),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 2442, 2567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2362),
+            id: DeclarationId(2378),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
+                template: DeclarationId(1041),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1054),
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1047),
                 }],
             },
             type_params: vec![],
@@ -77019,17 +77836,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6894, 6922),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 3902, 3918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2363),
+            id: DeclarationId(2379),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(935),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(827)],
+                output: DeclarationId(2378),
+                body: ArrowBody::NoBody,
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -77038,17 +77854,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 3881, 3918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2364),
+            id: DeclarationId(2380),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(940),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(19),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(20),
+                    value: DeclarationId(1047),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -77057,16 +77874,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 3930, 3945),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2365),
+            id: DeclarationId(2381),
             name: None,
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(827), DeclarationId(1047)],
+                output: DeclarationId(1043),
+                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/dimensions.dag", 3966, 4009),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2382),
+            name: Some("DimensionUnitAbelianGroup".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
+                template: DeclarationId(25),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1085),
+                    parameter: DeclarationId(26),
+                    value: DeclarationId(1049),
                 }],
             },
             type_params: vec![],
@@ -77077,16 +77912,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 27850, 27865),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2366),
+            id: DeclarationId(2383),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1084),
+                    value: DeclarationId(1011),
                 }],
             },
             type_params: vec![],
@@ -77097,16 +77932,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 29879, 29895),
+            span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6894, 6922),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2367),
+            id: DeclarationId(2384),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
+                template: DeclarationId(1041),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1084),
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1081),
                 }],
             },
             type_params: vec![],
@@ -77117,17 +77952,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 29988, 30004),
+            span: SourceSpan::new("src/v3/std/lens.dag", 4180, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2368),
+            id: DeclarationId(2385),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1084),
-                }],
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(827)],
+                output: DeclarationId(2384),
+                body: ArrowBody::NoBody,
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -77137,16 +77970,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 30102, 30118),
+            span: SourceSpan::new("src/v3/std/lens.dag", 4159, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2369),
+            id: DeclarationId(2386),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
+                template: DeclarationId(19),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(2368),
+                    parameter: DeclarationId(20),
+                    value: DeclarationId(1081),
                 }],
             },
             type_params: vec![],
@@ -77157,17 +77990,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 30097, 30119),
+            span: SourceSpan::new("src/v3/std/lens.dag", 4205, 4214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2370),
+            id: DeclarationId(2387),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1081), DeclarationId(1081)],
+                output: DeclarationId(1081),
+                body: ArrowBody::NoBody,
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -77176,17 +78008,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
+            span: SourceSpan::new("src/v3/std/lens.dag", 4225, 4238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2371),
+            id: DeclarationId(2388),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1081), DeclarationId(818)],
+                output: DeclarationId(1081),
+                body: ArrowBody::NoBody,
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -77195,17 +78026,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
+            span: SourceSpan::new("src/v3/std/lens.dag", 4250, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2372),
+            id: DeclarationId(2389),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(1081)],
+                output: DeclarationId(1043),
+                body: ArrowBody::NoBody,
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -77214,17 +78044,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
+            span: SourceSpan::new("src/v3/std/lens.dag", 4284, 4316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2373),
+            id: DeclarationId(2390),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "declaration".to_string(),
+                    ty: DeclarationId(723),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -77233,17 +78063,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 3564, 3611),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2374),
+            id: DeclarationId(2391),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "declaration".to_string(),
+                        ty: DeclarationId(723),
+                    },
+                    Field {
+                        label: "node".to_string(),
+                        ty: DeclarationId(721),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -77252,17 +78088,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 3616, 3677),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2375),
+            id: DeclarationId(2392),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -77271,12 +78102,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 4556, 4561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2376),
+            id: DeclarationId(2393),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1085)],
+                output: DeclarationId(1087),
+                body: ArrowBody::NoBody,
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -77285,12 +78120,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 5629, 5644),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 5798, 5821),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2377),
+            id: DeclarationId(2394),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1085), DeclarationId(1086)],
+                output: DeclarationId(128),
+                body: ArrowBody::NoBody,
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -77299,12 +78138,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 5684, 5697),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 5834, 5860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2378),
+            id: DeclarationId(2395),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1080),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1081),
+                    value: DeclarationId(1089),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -77313,12 +78158,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 5745, 5762),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 7871, 7883),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2379),
+            id: DeclarationId(2396),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1084),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1085),
+                        value: DeclarationId(1089),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1086),
+                        value: DeclarationId(1090),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1087),
+                        value: DeclarationId(1091),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -77327,12 +78188,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 5801, 5813),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 7899, 7941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2380),
+            id: DeclarationId(2397),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1088),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1089),
+                        value: DeclarationId(1093),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1090),
+                        value: DeclarationId(1094),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1091),
+                        value: DeclarationId(1095),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -77341,22 +78218,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 5861, 5878),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 9711, 9753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2381),
+            id: DeclarationId(2398),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "field".to_string(),
-                        ty: DeclarationId(1069),
-                    },
-                    Field {
-                        label: "factor".to_string(),
-                        ty: DeclarationId(938),
-                    },
-                ],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1080),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1081),
+                    value: DeclarationId(1097),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -77366,15 +78238,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 9971, 10033),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 10773, 10785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2382),
+            id: DeclarationId(2399),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "field".to_string(),
-                    ty: DeclarationId(1069),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1113),
                 }],
             },
             type_params: vec![],
@@ -77385,23 +78258,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 10038, 10080),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1179, 1196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2383),
+            id: DeclarationId(2400),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "param".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "factor".to_string(),
-                        ty: DeclarationId(938),
-                    },
-                ],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(1112),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -77410,12 +78277,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 10085, 10142),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2384),
+            id: DeclarationId(2401),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1105),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -77424,12 +78297,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 10147, 10161),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1747, 1764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2385),
+            id: DeclarationId(2402),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(2401),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -77438,12 +78316,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 10166, 10181),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1736, 1765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2386),
+            id: DeclarationId(2403),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1101),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -77452,15 +78336,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 24135, 24149),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1777, 1795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2387),
+            id: DeclarationId(2404),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
-                    label: "degree".to_string(),
-                    ty: DeclarationId(1221),
+                    label: "_0".to_string(),
+                    ty: DeclarationId(2403),
                 }],
             },
             type_params: vec![],
@@ -77471,22 +78355,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 24154, 24201),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1770, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2388),
+            id: DeclarationId(2405),
             name: None,
             connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "numerator".to_string(),
-                        ty: DeclarationId(1221),
-                    },
-                    Field {
-                        label: "root".to_string(),
-                        ty: DeclarationId(1221),
-                    },
-                ],
+                children: vec![Field {
+                    label: "ty".to_string(),
+                    ty: DeclarationId(1105),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -77496,20 +78374,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 24206, 24283),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 2089, 2117),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2389),
+            id: DeclarationId(2406),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "base".to_string(),
-                        ty: DeclarationId(1223),
+                        label: "decimal".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "argument".to_string(),
-                        ty: DeclarationId(1221),
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -77521,20 +78399,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 24288, 24362),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 2122, 2175),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2390),
+            id: DeclarationId(2407),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "param".to_string(),
+                        label: "name".to_string(),
                         ty: DeclarationId(230),
                     },
                     Field {
-                        label: "exponent".to_string(),
-                        ty: DeclarationId(1082),
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -77546,15 +78424,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 24982, 25038),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 2452, 2492),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2391),
+            id: DeclarationId(2408),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "param".to_string(),
-                    ty: DeclarationId(230),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1104),
                 }],
             },
             type_params: vec![],
@@ -77565,12 +78444,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 25054, 25079),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 2544, 2562),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2392),
+            id: DeclarationId(2409),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "name".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "args".to_string(),
+                        ty: DeclarationId(2408),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -77579,16 +78473,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 26728, 26741),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 2497, 2591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2393),
+            id: DeclarationId(2410),
             name: None,
             connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "cost".to_string(),
-                    ty: DeclarationId(1084),
-                }],
+                children: vec![
+                    Field {
+                        label: "inner".to_string(),
+                        ty: DeclarationId(1105),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -77598,16 +78498,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 26785, 26817),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 2596, 2660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2394),
+            id: DeclarationId(2411),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1084),
+                    value: DeclarationId(1105),
                 }],
             },
             type_params: vec![],
@@ -77618,16 +78518,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 26880, 26896),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 2687, 2704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2395),
+            id: DeclarationId(2412),
             name: None,
             connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "factors".to_string(),
-                    ty: DeclarationId(2394),
-                }],
+                children: vec![
+                    Field {
+                        label: "inputs".to_string(),
+                        ty: DeclarationId(2411),
+                    },
+                    Field {
+                        label: "output".to_string(),
+                        ty: DeclarationId(1105),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -77637,17 +78547,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 26856, 26898),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 2665, 2759),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2396),
+            id: DeclarationId(2413),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1084),
-                }],
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "name".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -77657,16 +78572,45 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 26960, 26976),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 4129, 4175),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2397),
+            id: DeclarationId(2414),
+            name: None,
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "name".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "binding".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    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", 4180, 4263),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2415),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2396),
+                    value: DeclarationId(1109),
                 }],
             },
             type_params: vec![],
@@ -77677,16 +78621,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 26955, 26977),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 4317, 4342),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2398),
+            id: DeclarationId(2416),
             name: None,
             connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "terms".to_string(),
-                    ty: DeclarationId(2397),
-                }],
+                children: vec![
+                    Field {
+                        label: "name".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "fields".to_string(),
+                        ty: DeclarationId(2415),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -77696,16 +78650,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 26927, 26979),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 4268, 4371),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2399),
+            id: DeclarationId(2417),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1085),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -77716,15 +78669,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 27277, 27292),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5043, 5054),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2400),
+            id: DeclarationId(2418),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
-                    label: "terms".to_string(),
-                    ty: DeclarationId(2399),
+                    label: "_0".to_string(),
+                    ty: DeclarationId(128),
                 }],
             },
             type_params: vec![],
@@ -77735,12 +78688,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 27259, 27294),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5059, 5069),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2401),
+            id: DeclarationId(2419),
             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,
@@ -77749,12 +78707,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 27377, 27389),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5074, 5088),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2402),
+            id: DeclarationId(2420),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "value".to_string(),
+                        ty: DeclarationId(1111),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -77763,17 +78732,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 27459, 27469),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5202, 5253),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2403),
+            id: DeclarationId(2421),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1316),
-                }],
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "name".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -77783,16 +78757,16 @@ 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),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5258, 5296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2404),
+            id: DeclarationId(2422),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1316),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -77803,16 +78777,16 @@ 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", 1414, 1434),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5324, 5336),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2405),
+            id: DeclarationId(2423),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1129),
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(159),
                 }],
             },
             type_params: vec![],
@@ -77823,15 +78797,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens.dag", 4180, 4190),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5358, 5374),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2406),
+            id: DeclarationId(2424),
             name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2405),
-                body: ArrowBody::NoBody,
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "segments".to_string(),
+                        ty: DeclarationId(2422),
+                    },
+                    Field {
+                        label: "segment_spans".to_string(),
+                        ty: DeclarationId(2423),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -77841,16 +78826,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens.dag", 4159, 4190),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5301, 5403),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2407),
+            id: DeclarationId(2425),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(19),
+                template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(20),
-                    value: DeclarationId(1129),
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1112),
                 }],
             },
             type_params: vec![],
@@ -77861,15 +78846,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens.dag", 4205, 4214),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5448, 5465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2408),
+            id: DeclarationId(2426),
             name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1129), DeclarationId(1129)],
-                output: DeclarationId(1129),
-                body: ArrowBody::NoBody,
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "target".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "args".to_string(),
+                        ty: DeclarationId(2425),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -77879,15 +78875,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens.dag", 4225, 4238),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5408, 5494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2409),
+            id: DeclarationId(2427),
             name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1129), DeclarationId(818)],
-                output: DeclarationId(1129),
-                body: ArrowBody::NoBody,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(230),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -77897,15 +78895,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens.dag", 4250, 4271),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6065, 6077),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2410),
+            id: DeclarationId(2428),
             name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(1129)],
-                output: DeclarationId(986),
-                body: ArrowBody::NoBody,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(159),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -77915,15 +78915,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens.dag", 4284, 4316),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6099, 6115),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2411),
+            id: DeclarationId(2429),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "declaration".to_string(),
-                    ty: DeclarationId(723),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1112),
                 }],
             },
             type_params: vec![],
@@ -77934,20 +78935,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 3305, 3352),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6128, 6145),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2412),
+            id: DeclarationId(2430),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "declaration".to_string(),
-                        ty: DeclarationId(723),
+                        label: "segments".to_string(),
+                        ty: DeclarationId(2427),
                     },
                     Field {
-                        label: "node".to_string(),
-                        ty: DeclarationId(721),
+                        label: "segment_spans".to_string(),
+                        ty: DeclarationId(2428),
+                    },
+                    Field {
+                        label: "args".to_string(),
+                        ty: DeclarationId(2429),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -77959,12 +78968,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 3357, 3418),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6038, 6174),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2413),
+            id: DeclarationId(2431),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1106),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -77973,15 +78988,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 4297, 4302),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6230, 6254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2414),
+            id: DeclarationId(2432),
             name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1133)],
-                output: DeclarationId(1134),
-                body: ArrowBody::NoBody,
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "target".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "fields".to_string(),
+                        ty: DeclarationId(2431),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -77991,15 +79017,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 5301, 5321),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6179, 6283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2415),
+            id: DeclarationId(2433),
             name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1134), DeclarationId(1134)],
-                output: DeclarationId(128),
-                body: ArrowBody::NoBody,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1112),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -78009,17 +79037,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 5334, 5360),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6334, 6351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2416),
+            id: DeclarationId(2434),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1128),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1129),
-                    value: DeclarationId(1136),
-                }],
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "op".to_string(),
+                        ty: DeclarationId(806),
+                    },
+                    Field {
+                        label: "args".to_string(),
+                        ty: DeclarationId(2433),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -78029,23 +79066,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 7360, 7372),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6288, 6380),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2417),
+            id: DeclarationId(2435),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1132),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(1133),
-                        value: DeclarationId(1136),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(1134),
-                        value: DeclarationId(1137),
-                    },
-                ],
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(230),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -78055,21 +79086,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 7388, 7419),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6408, 6420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2418),
+            id: DeclarationId(2436),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1135),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(1136),
-                        value: DeclarationId(1139),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "params".to_string(),
+                        ty: DeclarationId(2435),
                     },
-                    TemplateArgument {
-                        parameter: DeclarationId(1137),
-                        value: DeclarationId(1140),
+                    Field {
+                        label: "body".to_string(),
+                        ty: DeclarationId(1112),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -78081,17 +79115,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 9093, 9124),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6385, 6473),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2419),
+            id: DeclarationId(2437),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1128),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1129),
-                    value: DeclarationId(1142),
-                }],
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "cond".to_string(),
+                        ty: DeclarationId(1112),
+                    },
+                    Field {
+                        label: "then_branch".to_string(),
+                        ty: DeclarationId(1112),
+                    },
+                    Field {
+                        label: "else_branch".to_string(),
+                        ty: DeclarationId(1112),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -78101,16 +79148,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 10144, 10156),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6478, 6597),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2420),
+            id: DeclarationId(2438),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1143),
+                template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1144),
-                    value: DeclarationId(93),
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1108),
                 }],
             },
             type_params: vec![],
@@ -78121,17 +79168,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lookup.dag", 4589, 4600),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6651, 6672),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2421),
+            id: DeclarationId(2439),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1143),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1144),
-                    value: DeclarationId(93),
-                }],
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "scrutinee".to_string(),
+                        ty: DeclarationId(1112),
+                    },
+                    Field {
+                        label: "arms".to_string(),
+                        ty: DeclarationId(2438),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -78141,12 +79197,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lookup.dag", 4642, 4653),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6602, 6701),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2422),
+            id: DeclarationId(2440),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1106),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -78155,16 +79217,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lookup.dag", 4544, 4548),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6729, 6753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2423),
+            id: DeclarationId(2441),
             name: None,
             connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1144),
-                }],
+                children: vec![
+                    Field {
+                        label: "fields".to_string(),
+                        ty: DeclarationId(2440),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -78174,16 +79242,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lookup.dag", 4553, 4563),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6706, 6782),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2424),
+            id: DeclarationId(2442),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1162),
+                    value: DeclarationId(1112),
                 }],
             },
             type_params: vec![],
@@ -78194,17 +79262,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1179, 1196),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6810, 6827),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2425),
+            id: DeclarationId(2443),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1161),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "elements".to_string(),
+                        ty: DeclarationId(2442),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -78213,16 +79287,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6787, 6856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2426),
+            id: DeclarationId(2444),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1154),
+                    value: DeclarationId(1107),
                 }],
             },
             type_params: vec![],
@@ -78233,16 +79307,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1747, 1764),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 8950, 8971),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2427),
+            id: DeclarationId(2445),
             name: None,
             connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(2426),
-                }],
+                children: vec![
+                    Field {
+                        label: "entries".to_string(),
+                        ty: DeclarationId(2444),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -78252,18 +79332,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1736, 1765),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 8929, 9000),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2428),
+            id: DeclarationId(2446),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1150),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(1105),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -78272,16 +79351,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1777, 1795),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9931, 9943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2429),
+            id: DeclarationId(2447),
             name: None,
             connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(2428),
-                }],
+                children: vec![
+                    Field {
+                        label: "name".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "type_ann".to_string(),
+                        ty: DeclarationId(2446),
+                    },
+                    Field {
+                        label: "expr".to_string(),
+                        ty: DeclarationId(1112),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -78291,15 +79380,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1770, 1796),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9890, 9973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2430),
+            id: DeclarationId(2448),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "ty".to_string(),
-                    ty: DeclarationId(1154),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -78310,22 +79400,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 2089, 2117),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10021, 10033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2431),
+            id: DeclarationId(2449),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "decimal".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1100),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -78335,10 +79420,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 2122, 2175),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10048, 10066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2432),
+            id: DeclarationId(2450),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78346,6 +79431,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "name".to_string(),
                         ty: DeclarationId(230),
                     },
+                    Field {
+                        label: "type_params".to_string(),
+                        ty: DeclarationId(2448),
+                    },
+                    Field {
+                        label: "params".to_string(),
+                        ty: DeclarationId(2449),
+                    },
+                    Field {
+                        label: "return_type".to_string(),
+                        ty: DeclarationId(1105),
+                    },
+                    Field {
+                        label: "body".to_string(),
+                        ty: DeclarationId(1112),
+                    },
                     Field {
                         label: "span".to_string(),
                         ty: DeclarationId(159),
@@ -78360,16 +79461,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 2452, 2492),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9978, 10150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2433),
+            id: DeclarationId(2451),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1153),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -78380,10 +79481,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 2544, 2562),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10210, 10222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2434),
+            id: DeclarationId(2452),
+            name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1100),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: 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", 10237, 10255),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2453),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78392,8 +79513,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         ty: DeclarationId(230),
                     },
                     Field {
-                        label: "args".to_string(),
-                        ty: DeclarationId(2433),
+                        label: "type_params".to_string(),
+                        ty: DeclarationId(2451),
+                    },
+                    Field {
+                        label: "params".to_string(),
+                        ty: DeclarationId(2452),
+                    },
+                    Field {
+                        label: "return_type".to_string(),
+                        ty: DeclarationId(1105),
+                    },
+                    Field {
+                        label: "body_span".to_string(),
+                        ty: DeclarationId(159),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78409,23 +79542,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 2497, 2591),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10155, 10343),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2435),
+            id: DeclarationId(2454),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "inner".to_string(),
-                        ty: DeclarationId(1154),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(1112),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -78434,17 +79561,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 2596, 2660),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10408, 10420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2436),
+            id: DeclarationId(2455),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1154),
-                }],
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "name".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "ty".to_string(),
+                        ty: DeclarationId(1105),
+                    },
+                    Field {
+                        label: "body".to_string(),
+                        ty: DeclarationId(2454),
+                    },
+                    Field {
+                        label: "body_span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -78454,26 +79598,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 2687, 2704),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10348, 10477),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2437),
+            id: DeclarationId(2456),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "inputs".to_string(),
-                        ty: DeclarationId(2436),
-                    },
-                    Field {
-                        label: "output".to_string(),
-                        ty: DeclarationId(1154),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(230),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -78483,16 +79618,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 2665, 2759),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10497, 10509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2438),
+            id: DeclarationId(2457),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
+                        label: "path".to_string(),
+                        ty: DeclarationId(2456),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78508,26 +79643,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 4129, 4175),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10482, 10529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2439),
+            id: DeclarationId(2458),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "binding".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(230),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -78537,16 +79663,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 4180, 4263),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10555, 10567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2440),
+            id: DeclarationId(2459),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1158),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -78557,20 +79683,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 4317, 4342),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10581, 10593),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2441),
+            id: DeclarationId(2460),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
+                        label: "path".to_string(),
+                        ty: DeclarationId(2458),
                     },
                     Field {
-                        label: "fields".to_string(),
-                        ty: DeclarationId(2440),
+                        label: "names".to_string(),
+                        ty: DeclarationId(2459),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78586,15 +79712,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 4268, 4371),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10534, 10622),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2442),
+            id: DeclarationId(2461),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -78605,16 +79732,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5043, 5054),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10676, 10688),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2443),
+            id: DeclarationId(2462),
             name: None,
             connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(128),
-                }],
+                children: vec![
+                    Field {
+                        label: "name".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "type_params".to_string(),
+                        ty: DeclarationId(2461),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -78624,15 +79761,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5059, 5069),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10627, 10717),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2444),
+            id: DeclarationId(2463),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -78643,22 +79781,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5074, 5088),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10773, 10785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2445),
+            id: DeclarationId(2464),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "value".to_string(),
-                        ty: DeclarationId(1160),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1101),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -78668,10 +79801,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5202, 5253),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10800, 10818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2446),
+            id: DeclarationId(2465),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78679,6 +79812,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "name".to_string(),
                         ty: DeclarationId(230),
                     },
+                    Field {
+                        label: "type_params".to_string(),
+                        ty: DeclarationId(2463),
+                    },
+                    Field {
+                        label: "fields".to_string(),
+                        ty: DeclarationId(2464),
+                    },
                     Field {
                         label: "span".to_string(),
                         ty: DeclarationId(159),
@@ -78693,10 +79834,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5258, 5296),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10722, 10847),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2447),
+            id: DeclarationId(2466),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78713,16 +79854,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5324, 5336),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10900, 10912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2448),
+            id: DeclarationId(2467),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(159),
+                    value: DeclarationId(1102),
                 }],
             },
             type_params: vec![],
@@ -78733,20 +79874,47 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5358, 5374),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10929, 10949),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2449),
+            id: DeclarationId(2468),
+            name: None,
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(1105),
+                    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", 10966, 10978),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2469),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "segments".to_string(),
-                        ty: DeclarationId(2447),
+                        label: "name".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "segment_spans".to_string(),
-                        ty: DeclarationId(2448),
+                        label: "type_params".to_string(),
+                        ty: DeclarationId(2466),
+                    },
+                    Field {
+                        label: "variants".to_string(),
+                        ty: DeclarationId(2467),
+                    },
+                    Field {
+                        label: "inhabits".to_string(),
+                        ty: DeclarationId(2468),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78762,16 +79930,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5301, 5403),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10852, 11007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2450),
+            id: DeclarationId(2470),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1161),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -78782,20 +79950,51 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5448, 5465),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 11062, 11074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2451),
+            id: DeclarationId(2471),
+            name: None,
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(1112),
+                    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", 11146, 11158),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2472),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "target".to_string(),
+                        label: "name".to_string(),
                         ty: DeclarationId(230),
                     },
                     Field {
-                        label: "args".to_string(),
-                        ty: DeclarationId(2450),
+                        label: "type_params".to_string(),
+                        ty: DeclarationId(2470),
+                    },
+                    Field {
+                        label: "nominal_opaque".to_string(),
+                        ty: DeclarationId(128),
+                    },
+                    Field {
+                        label: "target".to_string(),
+                        ty: DeclarationId(1105),
+                    },
+                    Field {
+                        label: "refinement".to_string(),
+                        ty: DeclarationId(2471),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78811,16 +80010,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5408, 5494),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 11012, 11187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2452),
+            id: DeclarationId(2473),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(230),
+                    value: DeclarationId(1011),
                 }],
             },
             type_params: vec![],
@@ -78831,16 +80030,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6065, 6077),
+            span: SourceSpan::new(
+                "src/v3/std/python_method_template_contracts.dag",
+                6752,
+                6780,
+            ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2453),
+            id: DeclarationId(2474),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(159),
+                    value: DeclarationId(1125),
                 }],
             },
             type_params: vec![],
@@ -78851,16 +80054,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6099, 6115),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 11243, 11254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2454),
+            id: DeclarationId(2475),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1161),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(782),
                 }],
             },
             type_params: vec![],
@@ -78871,30 +80073,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6128, 6145),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 2137, 2162),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2455),
+            id: DeclarationId(2476),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "segments".to_string(),
-                        ty: DeclarationId(2452),
-                    },
-                    Field {
-                        label: "segment_spans".to_string(),
-                        ty: DeclarationId(2453),
-                    },
-                    Field {
-                        label: "args".to_string(),
-                        ty: DeclarationId(2454),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1124),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -78904,16 +80093,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6038, 6174),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 2179, 2195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2456),
+            id: DeclarationId(2477),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1155),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(2476),
                 }],
             },
             type_params: vec![],
@@ -78924,24 +80112,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6230, 6254),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 2167, 2196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2457),
+            id: DeclarationId(2478),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "target".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "fields".to_string(),
-                        ty: DeclarationId(2456),
+                        label: "tag".to_string(),
+                        ty: DeclarationId(723),
                     },
                     Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
+                        label: "payload".to_string(),
+                        ty: DeclarationId(1125),
                     },
                 ],
             },
@@ -78953,16 +80137,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6179, 6283),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 2201, 2252),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2458),
+            id: DeclarationId(2479),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1161),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(721),
                 }],
             },
             type_params: vec![],
@@ -78973,26 +80156,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6334, 6351),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 2257, 2272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2459),
+            id: DeclarationId(2480),
             name: None,
             connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "op".to_string(),
-                        ty: DeclarationId(806),
-                    },
-                    Field {
-                        label: "args".to_string(),
-                        ty: DeclarationId(2458),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(818),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -79002,17 +80175,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6288, 6380),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 2277, 2304),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2460),
+            id: DeclarationId(2481),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(230),
-                }],
+                template: DeclarationId(137),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(722),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(1125),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -79022,26 +80201,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6408, 6420),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 3936, 3954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2461),
+            id: DeclarationId(2482),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "params".to_string(),
-                        ty: DeclarationId(2460),
-                    },
-                    Field {
-                        label: "body".to_string(),
-                        ty: DeclarationId(1161),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1128),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -79051,30 +80221,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6385, 6473),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 4542, 4557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2462),
+            id: DeclarationId(2483),
             name: None,
             connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "cond".to_string(),
-                        ty: DeclarationId(1161),
-                    },
-                    Field {
-                        label: "then_branch".to_string(),
-                        ty: DeclarationId(1161),
-                    },
-                    Field {
-                        label: "else_branch".to_string(),
-                        ty: DeclarationId(1161),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
+                children: vec![Field {
+                    label: "input_order".to_string(),
+                    ty: DeclarationId(1132),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -79084,18 +80240,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6478, 6597),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 5388, 5442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2463),
+            id: DeclarationId(2484),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1157),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -79104,27 +80254,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6651, 6672),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 5682, 5691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2464),
+            id: DeclarationId(2485),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "scrutinee".to_string(),
-                        ty: DeclarationId(1161),
-                    },
-                    Field {
-                        label: "arms".to_string(),
-                        ty: DeclarationId(2463),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -79133,16 +80268,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6602, 6701),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 5694, 5704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2465),
+            id: DeclarationId(2486),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1155),
+                    value: DeclarationId(1011),
                 }],
             },
             type_params: vec![],
@@ -79153,23 +80288,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6729, 6753),
+            span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5769, 5797),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2466),
+            id: DeclarationId(2487),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "fields".to_string(),
-                        ty: DeclarationId(2465),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(1140),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -79178,18 +80307,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6706, 6782),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2467),
+            id: DeclarationId(2488),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1161),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(1140),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -79198,23 +80326,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6810, 6827),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
-        declarations.push(Declaration {
-            id: DeclarationId(2468),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "elements".to_string(),
-                        ty: DeclarationId(2467),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
-            },
+        declarations.push(Declaration {
+            id: DeclarationId(2489),
+            name: None,
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(1140),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -79223,17 +80345,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6787, 6856),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2469),
+            id: DeclarationId(2490),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1156),
-                }],
+                template: DeclarationId(137),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(1140),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -79243,20 +80371,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 8950, 8971),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2732, 2760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2470),
+            id: DeclarationId(2491),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "entries".to_string(),
-                        ty: DeclarationId(2469),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(137),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
                     },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
+                    TemplateArgument {
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(1140),
                     },
                 ],
             },
@@ -79268,14 +80397,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 8929, 9000),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2804, 2832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2471),
+            id: DeclarationId(2492),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1154),
+                    DeclarationId(1148),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -79287,27 +80416,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9931, 9943),
+            span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2472),
+            id: DeclarationId(2493),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "type_ann".to_string(),
-                        ty: DeclarationId(2471),
-                    },
-                    Field {
-                        label: "expr".to_string(),
-                        ty: DeclarationId(1161),
-                    },
-                ],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(1150),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -79316,17 +80435,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9890, 9973),
+            span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2473),
+            id: DeclarationId(2494),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(230),
-                }],
+                template: DeclarationId(11),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(12),
+                        value: DeclarationId(1161),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(13),
+                        value: DeclarationId(1160),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -79336,18 +80461,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10021, 10033),
+            span: SourceSpan::new("src/v3/std/termination.dag", 12353, 12399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2474),
+            id: DeclarationId(2495),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1149),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -79356,39 +80475,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10048, 10066),
+            span: SourceSpan::new("src/v3/std/termination.dag", 767, 773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2475),
+            id: DeclarationId(2496),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "type_params".to_string(),
-                        ty: DeclarationId(2473),
-                    },
-                    Field {
-                        label: "params".to_string(),
-                        ty: DeclarationId(2474),
-                    },
-                    Field {
-                        label: "return_type".to_string(),
-                        ty: DeclarationId(1154),
-                    },
-                    Field {
-                        label: "body".to_string(),
-                        ty: DeclarationId(1161),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -79397,18 +80489,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9978, 10150),
+            span: SourceSpan::new("src/v3/std/termination.dag", 778, 791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2476),
+            id: DeclarationId(2497),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -79417,16 +80503,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10210, 10222),
+            span: SourceSpan::new("src/v3/std/termination.dag", 796, 810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2477),
+            id: DeclarationId(2498),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1149),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "param".to_string(),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -79437,38 +80522,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10237, 10255),
+            span: SourceSpan::new("src/v3/std/termination.dag", 3332, 3358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2478),
+            id: DeclarationId(2499),
             name: None,
             connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "type_params".to_string(),
-                        ty: DeclarationId(2476),
-                    },
-                    Field {
-                        label: "params".to_string(),
-                        ty: DeclarationId(2477),
-                    },
-                    Field {
-                        label: "return_type".to_string(),
-                        ty: DeclarationId(1154),
-                    },
-                    Field {
-                        label: "body_span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
+                children: vec![Field {
+                    label: "param".to_string(),
+                    ty: DeclarationId(230),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -79478,53 +80541,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10155, 10343),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2479),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1161),
-                    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", 10408, 10420),
+            span: SourceSpan::new("src/v3/std/termination.dag", 3363, 3391),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2480),
+            id: DeclarationId(2500),
             name: None,
             connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "ty".to_string(),
-                        ty: DeclarationId(1154),
-                    },
-                    Field {
-                        label: "body".to_string(),
-                        ty: DeclarationId(2479),
-                    },
-                    Field {
-                        label: "body_span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
+                children: vec![Field {
+                    label: "param".to_string(),
+                    ty: DeclarationId(230),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -79534,16 +80560,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10348, 10477),
+            span: SourceSpan::new("src/v3/std/termination.dag", 3396, 3429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2481),
+            id: DeclarationId(2501),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(230),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "param".to_string(),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -79554,22 +80579,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10497, 10509),
+            span: SourceSpan::new("src/v3/std/termination.dag", 3434, 3465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2482),
+            id: DeclarationId(2502),
             name: None,
             connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "path".to_string(),
-                        ty: DeclarationId(2481),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
+                children: vec![Field {
+                    label: "param".to_string(),
+                    ty: DeclarationId(230),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -79579,18 +80598,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10482, 10529),
+            span: SourceSpan::new("src/v3/std/termination.dag", 3470, 3502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2483),
+            id: DeclarationId(2503),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -79599,16 +80612,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10555, 10567),
+            span: SourceSpan::new("src/v3/std/termination.dag", 4509, 4516),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2484),
+            id: DeclarationId(2504),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(230),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "previous".to_string(),
+                    ty: DeclarationId(1148),
                 }],
             },
             type_params: vec![],
@@ -79619,27 +80631,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10581, 10593),
+            span: SourceSpan::new("src/v3/std/termination.dag", 4521, 4571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2485),
+            id: DeclarationId(2505),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "path".to_string(),
-                        ty: DeclarationId(2483),
-                    },
-                    Field {
-                        label: "names".to_string(),
-                        ty: DeclarationId(2484),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -79648,16 +80645,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10534, 10622),
+            span: SourceSpan::new("src/v3/std/termination.dag", 5484, 5495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2486),
+            id: DeclarationId(2506),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(230),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "inner".to_string(),
+                    ty: DeclarationId(1150),
                 }],
             },
             type_params: vec![],
@@ -79668,26 +80664,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10676, 10688),
+            span: SourceSpan::new("src/v3/std/termination.dag", 5500, 5545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2487),
+            id: DeclarationId(2507),
             name: None,
             connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "type_params".to_string(),
-                        ty: DeclarationId(2486),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
+                children: vec![Field {
+                    label: "accessor".to_string(),
+                    ty: DeclarationId(230),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -79697,16 +80683,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10627, 10717),
+            span: SourceSpan::new("src/v3/std/termination.dag", 7649, 7683),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2488),
+            id: DeclarationId(2508),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(230),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "amount".to_string(),
+                    ty: DeclarationId(1148),
                 }],
             },
             type_params: vec![],
@@ -79717,16 +80702,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10773, 10785),
+            span: SourceSpan::new("src/v3/std/termination.dag", 7688, 7732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2489),
+            id: DeclarationId(2509),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1150),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "steps".to_string(),
+                    ty: DeclarationId(1148),
                 }],
             },
             type_params: vec![],
@@ -79737,30 +80721,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10800, 10818),
+            span: SourceSpan::new("src/v3/std/termination.dag", 7737, 7795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2490),
+            id: DeclarationId(2510),
             name: None,
             connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "type_params".to_string(),
-                        ty: DeclarationId(2488),
-                    },
-                    Field {
-                        label: "fields".to_string(),
-                        ty: DeclarationId(2489),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
+                children: vec![Field {
+                    label: "divisor".to_string(),
+                    ty: DeclarationId(1150),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -79770,16 +80740,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10722, 10847),
+            span: SourceSpan::new("src/v3/std/termination.dag", 7800, 7856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2491),
+            id: DeclarationId(2511),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(230),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "witness".to_string(),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -79790,16 +80759,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10900, 10912),
+            span: SourceSpan::new("src/v3/std/termination.dag", 7861, 7894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2492),
+            id: DeclarationId(2512),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1151),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "element".to_string(),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -79810,17 +80778,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10929, 10949),
+            span: SourceSpan::new("src/v3/std/termination.dag", 7899, 7929),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2493),
+            id: DeclarationId(2513),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1154),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -79829,34 +80792,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10966, 10978),
+            span: SourceSpan::new("src/v3/std/termination.dag", 7934, 7947),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2494),
+            id: DeclarationId(2514),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "type_params".to_string(),
-                        ty: DeclarationId(2491),
-                    },
-                    Field {
-                        label: "variants".to_string(),
-                        ty: DeclarationId(2492),
-                    },
-                    Field {
-                        label: "inhabits".to_string(),
-                        ty: DeclarationId(2493),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1147),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -79866,16 +80812,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10852, 11007),
+            span: SourceSpan::new("src/v3/std/termination.dag", 7987, 8009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2495),
+            id: DeclarationId(2515),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(230),
+                    value: DeclarationId(1140),
                 }],
             },
             type_params: vec![],
@@ -79886,17 +80832,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 11062, 11074),
+            span: SourceSpan::new("src/v3/std/termination.dag", 8219, 8240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2496),
+            id: DeclarationId(2516),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1161),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -79905,39 +80846,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 11146, 11158),
+            span: SourceSpan::new("src/v3/std/termination.dag", 8740, 8746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2497),
+            id: DeclarationId(2517),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "type_params".to_string(),
-                        ty: DeclarationId(2495),
-                    },
-                    Field {
-                        label: "nominal_opaque".to_string(),
-                        ty: DeclarationId(128),
-                    },
-                    Field {
-                        label: "target".to_string(),
-                        ty: DeclarationId(1154),
-                    },
-                    Field {
-                        label: "refinement".to_string(),
-                        ty: DeclarationId(2496),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -79946,18 +80860,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 11012, 11187),
+            span: SourceSpan::new("src/v3/std/termination.dag", 9139, 9152),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2498),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1054),
-                }],
-            },
+            id: DeclarationId(2518),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -79966,20 +80874,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new(
-                "src/v3/std/python_method_template_contracts.dag",
-                6752,
-                6780,
-            ),
+            span: SourceSpan::new("src/v3/std/termination.dag", 9157, 9171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2499),
+            id: DeclarationId(2519),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1176),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(1159),
                 }],
             },
             type_params: vec![],
@@ -79990,17 +80893,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 11243, 11254),
+            span: SourceSpan::new("src/v3/std/termination.dag", 10263, 10297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2500),
+            id: DeclarationId(2520),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(782),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80009,17 +80907,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 2137, 2162),
+            span: SourceSpan::new("src/v3/std/termination.dag", 10302, 10320),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2501),
+            id: DeclarationId(2521),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1175),
-                }],
+                template: DeclarationId(137),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(1158),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -80029,17 +80933,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 2179, 2195),
+            span: SourceSpan::new("src/v3/std/termination.dag", 11234, 11261),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2502),
+            id: DeclarationId(2522),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(2501),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(956),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80048,23 +80952,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 2167, 2196),
+            span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2503),
+            id: DeclarationId(2523),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "tag".to_string(),
-                        ty: DeclarationId(723),
-                    },
-                    Field {
-                        label: "payload".to_string(),
-                        ty: DeclarationId(1176),
-                    },
-                ],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(961),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80073,15 +80971,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 2201, 2252),
+            span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2504),
+            id: DeclarationId(2524),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(721),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1180),
                 }],
             },
             type_params: vec![],
@@ -80092,15 +80991,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 2257, 2272),
+            span: SourceSpan::new("src/v3/std/induction.dag", 27850, 27865),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2505),
+            id: DeclarationId(2525),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(818),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1179),
                 }],
             },
             type_params: vec![],
@@ -80111,23 +81011,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 2277, 2304),
+            span: SourceSpan::new("src/v3/std/induction.dag", 29879, 29895),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2506),
+            id: DeclarationId(2526),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(137),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(138),
-                        value: DeclarationId(722),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(139),
-                        value: DeclarationId(1176),
-                    },
-                ],
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1179),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -80137,10 +81031,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 3936, 3954),
+            span: SourceSpan::new("src/v3/std/induction.dag", 29988, 30004),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2507),
+            id: DeclarationId(2527),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80157,15 +81051,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 4542, 4557),
+            span: SourceSpan::new("src/v3/std/induction.dag", 30102, 30118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2508),
+            id: DeclarationId(2528),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "input_order".to_string(),
-                    ty: DeclarationId(1183),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(2527),
                 }],
             },
             type_params: vec![],
@@ -80176,12 +81071,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 5388, 5442),
+            span: SourceSpan::new("src/v3/std/induction.dag", 30097, 30119),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2509),
+            id: DeclarationId(2529),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(93),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80190,12 +81090,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 5682, 5691),
+            span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2510),
+            id: DeclarationId(2530),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(93),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80204,18 +81109,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 5694, 5704),
+            span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2511),
+            id: DeclarationId(2531),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1054),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(93),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80224,24 +81128,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5769, 5797),
+            span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2512),
+            id: DeclarationId(2532),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(137),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(138),
-                        value: DeclarationId(230),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(139),
-                        value: DeclarationId(1191),
-                    },
-                ],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(93),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80250,18 +81147,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/services.dag", 6784, 6807),
+            span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2513),
+            id: DeclarationId(2533),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(93),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80270,18 +81166,17 @@ 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),
+            span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2514),
+            id: DeclarationId(2534),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(93),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80290,18 +81185,12 @@ 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", 4626, 4652),
+            span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2515),
+            id: DeclarationId(2535),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(799),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80310,18 +81199,12 @@ 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", 4920, 4937),
+            span: SourceSpan::new("src/v3/std/induction.dag", 5629, 5644),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2516),
+            id: DeclarationId(2536),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(827),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80330,18 +81213,12 @@ 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", 4988, 5002),
+            span: SourceSpan::new("src/v3/std/induction.dag", 5684, 5697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2517),
+            id: DeclarationId(2537),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(781),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80350,18 +81227,12 @@ 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", 5052, 5065),
+            span: SourceSpan::new("src/v3/std/induction.dag", 5745, 5762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2518),
+            id: DeclarationId(2538),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(817),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80370,18 +81241,12 @@ 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", 5115, 5128),
+            span: SourceSpan::new("src/v3/std/induction.dag", 5801, 5813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2519),
+            id: DeclarationId(2539),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(982),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80390,17 +81255,22 @@ 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", 5176, 5192),
+            span: SourceSpan::new("src/v3/std/induction.dag", 5861, 5878),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2520),
+            id: DeclarationId(2540),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
-                }],
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "field".to_string(),
+                        ty: DeclarationId(1164),
+                    },
+                    Field {
+                        label: "factor".to_string(),
+                        ty: DeclarationId(959),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -80410,16 +81280,15 @@ 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", 5245, 5271),
+            span: SourceSpan::new("src/v3/std/induction.dag", 9971, 10033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2521),
+            id: DeclarationId(2541),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(2520),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "field".to_string(),
+                    ty: DeclarationId(1164),
                 }],
             },
             type_params: vec![],
@@ -80430,17 +81299,22 @@ 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", 5240, 5272),
+            span: SourceSpan::new("src/v3/std/induction.dag", 10038, 10080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2522),
+            id: DeclarationId(2542),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
-                }],
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "param".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "factor".to_string(),
+                        ty: DeclarationId(959),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -80450,18 +81324,12 @@ 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", 5346, 5372),
+            span: SourceSpan::new("src/v3/std/induction.dag", 10085, 10142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2523),
+            id: DeclarationId(2543),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(2522),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80470,18 +81338,12 @@ 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", 5341, 5373),
+            span: SourceSpan::new("src/v3/std/induction.dag", 10147, 10161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2524),
+            id: DeclarationId(2544),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(982),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80490,18 +81352,12 @@ 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", 5498, 5514),
+            span: SourceSpan::new("src/v3/std/induction.dag", 10166, 10181),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2525),
+            id: DeclarationId(2545),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(987),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(988),
-                    value: DeclarationId(1238),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80510,16 +81366,15 @@ 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/induction.dag", 24135, 24149),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2526),
+            id: DeclarationId(2546),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(987),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(988),
-                    value: DeclarationId(1238),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "degree".to_string(),
+                    ty: DeclarationId(1148),
                 }],
             },
             type_params: vec![],
@@ -80530,17 +81385,22 @@ 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/induction.dag", 24154, 24201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2527),
+            id: DeclarationId(2547),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(987),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(988),
-                    value: DeclarationId(1238),
-                }],
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "numerator".to_string(),
+                        ty: DeclarationId(1148),
+                    },
+                    Field {
+                        label: "root".to_string(),
+                        ty: DeclarationId(1148),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -80550,17 +81410,22 @@ 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/induction.dag", 24206, 24283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2528),
+            id: DeclarationId(2548),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(987),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(988),
-                    value: DeclarationId(1238),
-                }],
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "base".to_string(),
+                        ty: DeclarationId(1150),
+                    },
+                    Field {
+                        label: "argument".to_string(),
+                        ty: DeclarationId(1148),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -80570,17 +81435,22 @@ 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),
+            span: SourceSpan::new("src/v3/std/induction.dag", 24288, 24362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2529),
+            id: DeclarationId(2549),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(987),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(988),
-                    value: DeclarationId(1238),
-                }],
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "param".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "exponent".to_string(),
+                        ty: DeclarationId(1177),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -80590,16 +81460,15 @@ 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", 6955, 6989),
+            span: SourceSpan::new("src/v3/std/induction.dag", 24982, 25038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2530),
+            id: DeclarationId(2550),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "param".to_string(),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -80610,18 +81479,12 @@ 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", 7169, 7195),
+            span: SourceSpan::new("src/v3/std/induction.dag", 25054, 25079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2531),
+            id: DeclarationId(2551),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(987),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(988),
-                    value: DeclarationId(1238),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80630,16 +81493,15 @@ 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", 7200, 7234),
+            span: SourceSpan::new("src/v3/std/induction.dag", 26728, 26741),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2532),
+            id: DeclarationId(2552),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(987),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(988),
-                    value: DeclarationId(1238),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "cost".to_string(),
+                    ty: DeclarationId(1179),
                 }],
             },
             type_params: vec![],
@@ -80650,16 +81512,16 @@ 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", 8469, 8503),
+            span: SourceSpan::new("src/v3/std/induction.dag", 26785, 26817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2533),
+            id: DeclarationId(2553),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2307),
+                template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1179),
                 }],
             },
             type_params: vec![],
@@ -80670,16 +81532,15 @@ 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),
+            span: SourceSpan::new("src/v3/std/induction.dag", 26880, 26896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2534),
+            id: DeclarationId(2554),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2307),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "factors".to_string(),
+                    ty: DeclarationId(2553),
                 }],
             },
             type_params: vec![],
@@ -80690,16 +81551,16 @@ 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),
+            span: SourceSpan::new("src/v3/std/induction.dag", 26856, 26898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2535),
+            id: DeclarationId(2555),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2307),
+                template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1179),
                 }],
             },
             type_params: vec![],
@@ -80710,16 +81571,16 @@ 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),
+            span: SourceSpan::new("src/v3/std/induction.dag", 26960, 26976),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2536),
+            id: DeclarationId(2556),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2307),
+                template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(2555),
                 }],
             },
             type_params: vec![],
@@ -80730,16 +81591,15 @@ 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),
+            span: SourceSpan::new("src/v3/std/induction.dag", 26955, 26977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2537),
+            id: DeclarationId(2557),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2307),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "terms".to_string(),
+                    ty: DeclarationId(2556),
                 }],
             },
             type_params: vec![],
@@ -80750,16 +81610,16 @@ 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),
+            span: SourceSpan::new("src/v3/std/induction.dag", 26927, 26979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2538),
+            id: DeclarationId(2558),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2307),
+                template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1180),
                 }],
             },
             type_params: vec![],
@@ -80770,16 +81630,15 @@ 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),
+            span: SourceSpan::new("src/v3/std/induction.dag", 27277, 27292),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2539),
+            id: DeclarationId(2559),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2307),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "terms".to_string(),
+                    ty: DeclarationId(2558),
                 }],
             },
             type_params: vec![],
@@ -80790,18 +81649,12 @@ 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),
+            span: SourceSpan::new("src/v3/std/induction.dag", 27259, 27294),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2540),
+            id: DeclarationId(2560),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2307),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80810,18 +81663,12 @@ 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),
+            span: SourceSpan::new("src/v3/std/induction.dag", 27377, 27389),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2541),
+            id: DeclarationId(2561),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2307),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80830,18 +81677,26 @@ 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),
+            span: SourceSpan::new("src/v3/std/induction.dag", 27459, 27469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2542),
+            id: DeclarationId(2562),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2307),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
-                }],
-            },
+            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/tokenize.dag", 646, 651),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2563),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80850,18 +81705,12 @@ 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),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2543),
+            id: DeclarationId(2564),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1819),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(799),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80870,18 +81719,12 @@ 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", 4920, 4937),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2544),
+            id: DeclarationId(2565),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1819),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(827),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80890,18 +81733,12 @@ 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", 4988, 5002),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2545),
+            id: DeclarationId(2566),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1819),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(781),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80910,18 +81747,12 @@ 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", 5052, 5065),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2546),
+            id: DeclarationId(2567),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1819),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(817),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80930,18 +81761,12 @@ 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", 5115, 5128),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2547),
+            id: DeclarationId(2568),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1819),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(982),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80950,18 +81775,12 @@ 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", 5176, 5192),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 715),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2548),
+            id: DeclarationId(2569),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1819),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(2520),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80970,18 +81789,12 @@ 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", 5240, 5272),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 720, 728),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2549),
+            id: DeclarationId(2570),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1821),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(2522),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80990,18 +81803,12 @@ 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", 5341, 5373),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 733, 740),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2550),
+            id: DeclarationId(2571),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2307),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81010,18 +81817,12 @@ 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", 5346, 5372),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 745, 751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2551),
+            id: DeclarationId(2572),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1821),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(982),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81030,18 +81831,12 @@ 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", 5498, 5514),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 756, 763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2552),
+            id: DeclarationId(2573),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2313),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(988),
-                    value: DeclarationId(1238),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81050,18 +81845,12 @@ 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/tokenize.dag", 768, 774),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2553),
+            id: DeclarationId(2574),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2317),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(988),
-                    value: DeclarationId(1238),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81070,17 +81859,17 @@ 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/tokenize.dag", 779, 786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2554),
+            id: DeclarationId(2575),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1213),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81089,17 +81878,17 @@ 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/tokenize.dag", 791, 804),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2555),
+            id: DeclarationId(2576),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1213),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81108,17 +81897,17 @@ 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/tokenize.dag", 889, 903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2556),
+            id: DeclarationId(2577),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1213),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81127,24 +81916,12 @@ 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/tokenize.dag", 908, 925),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2557),
+            id: DeclarationId(2578),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(137),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(138),
-                        value: DeclarationId(230),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(139),
-                        value: DeclarationId(1213),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81153,24 +81930,12 @@ 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),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 930, 932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2558),
+            id: DeclarationId(2579),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(137),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(138),
-                        value: DeclarationId(230),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(139),
-                        value: DeclarationId(1213),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81179,17 +81944,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 2804, 2832),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 937, 941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2559),
+            id: DeclarationId(2580),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1221),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81198,17 +81958,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 946, 951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2560),
+            id: DeclarationId(2581),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1223),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81217,24 +81972,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 956, 958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2561),
+            id: DeclarationId(2582),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(11),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(12),
-                        value: DeclarationId(1234),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(13),
-                        value: DeclarationId(1233),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81243,10 +81986,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 12353, 12399),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 963, 965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2562),
+            id: DeclarationId(2583),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81257,10 +82000,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 767, 773),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 970, 972),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2563),
+            id: DeclarationId(2584),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81271,10 +82014,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 778, 791),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 977, 979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2564),
+            id: DeclarationId(2585),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81285,17 +82028,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 796, 810),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 984, 988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2565),
+            id: DeclarationId(2586),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "param".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81304,17 +82042,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 3332, 3358),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 993, 998),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2566),
+            id: DeclarationId(2587),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "param".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81323,17 +82056,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 3363, 3391),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1003, 1007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2567),
+            id: DeclarationId(2588),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "param".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81342,17 +82070,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 3396, 3429),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1012, 1017),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2568),
+            id: DeclarationId(2589),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "param".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81361,17 +82084,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 3434, 3465),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1022, 1028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2569),
+            id: DeclarationId(2590),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "param".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81380,10 +82098,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 3470, 3502),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1033, 1041),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2570),
+            id: DeclarationId(2591),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81394,17 +82112,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 4509, 4516),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1046, 1051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2571),
+            id: DeclarationId(2592),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "previous".to_string(),
-                    ty: DeclarationId(1221),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81413,10 +82126,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 4521, 4571),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1056, 1061),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2572),
+            id: DeclarationId(2593),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81427,17 +82140,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 5484, 5495),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1066, 1074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2573),
+            id: DeclarationId(2594),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "inner".to_string(),
-                    ty: DeclarationId(1223),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81446,17 +82154,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 5500, 5545),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1079, 1088),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2574),
+            id: DeclarationId(2595),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "accessor".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81465,17 +82168,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 7649, 7683),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1093, 1096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2575),
+            id: DeclarationId(2596),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "amount".to_string(),
-                    ty: DeclarationId(1221),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81484,17 +82182,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 7688, 7732),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1101, 1107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2576),
+            id: DeclarationId(2597),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "steps".to_string(),
-                    ty: DeclarationId(1221),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81503,17 +82196,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 7737, 7795),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1112, 1118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2577),
+            id: DeclarationId(2598),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "divisor".to_string(),
-                    ty: DeclarationId(1223),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81522,17 +82210,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 7800, 7856),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1123, 1129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2578),
+            id: DeclarationId(2599),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "witness".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81541,17 +82224,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 7861, 7894),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1134, 1140),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2579),
+            id: DeclarationId(2600),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "element".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81560,10 +82238,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 7899, 7929),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1145, 1153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2580),
+            id: DeclarationId(2601),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81574,18 +82252,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 7934, 7947),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1158, 1166),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2581),
+            id: DeclarationId(2602),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1220),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81594,18 +82266,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 7987, 8009),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1171, 1176),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2582),
+            id: DeclarationId(2603),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1213),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81614,10 +82280,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 8219, 8240),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1181, 1190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2583),
+            id: DeclarationId(2604),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81628,10 +82294,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 8740, 8746),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1195, 1199),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2584),
+            id: DeclarationId(2605),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81642,10 +82308,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 9139, 9152),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1204, 1212),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2585),
+            id: DeclarationId(2606),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81656,17 +82322,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 9157, 9171),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1217, 1220),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2586),
+            id: DeclarationId(2607),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1232),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81675,10 +82336,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 10263, 10297),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1791, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2587),
+            id: DeclarationId(2608),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81689,24 +82350,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 10302, 10320),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1801, 1805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2588),
+            id: DeclarationId(2609),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(137),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(138),
-                        value: DeclarationId(230),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(139),
-                        value: DeclarationId(1231),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81715,18 +82364,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 11234, 11261),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1810, 1816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2589),
+            id: DeclarationId(2610),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(978),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81735,18 +82378,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9931, 9947),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1821, 1827),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2590),
+            id: DeclarationId(2611),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81755,17 +82392,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1832, 1836),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2591),
+            id: DeclarationId(2612),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "duration".to_string(),
-                    ty: DeclarationId(1237),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81774,10 +82406,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 4032, 4066),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1841, 1847),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2592),
+            id: DeclarationId(2613),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81788,10 +82420,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 4071, 4081),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1852, 1860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2593),
+            id: DeclarationId(2614),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81802,10 +82434,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 4086, 4095),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1865, 1873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2594),
+            id: DeclarationId(2615),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81816,18 +82448,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 4100, 4105),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1878, 1885),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2595),
+            id: DeclarationId(2616),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1243),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81836,18 +82462,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7603, 7631),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1890, 1896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2596),
+            id: DeclarationId(2617),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1819),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(978),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81856,18 +82476,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9931, 9947),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1901, 1908),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2597),
+            id: DeclarationId(2618),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2307),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81876,18 +82490,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1913, 1919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2598),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2307),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
-                }],
-            },
+            id: DeclarationId(2619),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81896,18 +82504,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1924, 1931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2599),
+            id: DeclarationId(2620),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2307),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81916,18 +82518,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2371, 2373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2600),
+            id: DeclarationId(2621),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2307),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81936,18 +82532,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2378, 2382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2601),
+            id: DeclarationId(2622),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2307),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81956,18 +82546,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2387, 2392),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2602),
+            id: DeclarationId(2623),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2307),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81976,18 +82560,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2397, 2399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2603),
+            id: DeclarationId(2624),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2307),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81996,18 +82574,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2404, 2406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2604),
+            id: DeclarationId(2625),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2307),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82016,18 +82588,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2411, 2413),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2605),
+            id: DeclarationId(2626),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2307),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82036,18 +82602,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2418, 2420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2606),
+            id: DeclarationId(2627),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2307),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82056,10 +82616,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2425, 2429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2607),
+            id: DeclarationId(2628),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82070,10 +82630,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2434, 2439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2608),
+            id: DeclarationId(2629),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82084,10 +82644,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2444, 2448),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2609),
+            id: DeclarationId(2630),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82098,10 +82658,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2453, 2458),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2610),
+            id: DeclarationId(2631),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82112,10 +82672,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2463, 2469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2611),
+            id: DeclarationId(2632),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82126,10 +82686,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2474, 2482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2612),
+            id: DeclarationId(2633),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82140,10 +82700,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2487, 2492),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2613),
+            id: DeclarationId(2634),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82154,10 +82714,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 715),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2497, 2502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2614),
+            id: DeclarationId(2635),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82168,10 +82728,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 720, 728),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2507, 2515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2615),
+            id: DeclarationId(2636),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82182,10 +82742,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 733, 740),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2520, 2529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2616),
+            id: DeclarationId(2637),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82196,10 +82756,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 745, 751),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2534, 2537),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2617),
+            id: DeclarationId(2638),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82210,10 +82770,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 756, 763),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2542, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2618),
+            id: DeclarationId(2639),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82224,10 +82784,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 768, 774),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2553, 2559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2619),
+            id: DeclarationId(2640),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82238,17 +82798,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 779, 786),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2564, 2570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2620),
+            id: DeclarationId(2641),
             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,
@@ -82257,17 +82812,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 791, 804),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2575, 2581),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2621),
+            id: DeclarationId(2642),
             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,
@@ -82276,17 +82826,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 889, 903),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2586, 2594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2622),
+            id: DeclarationId(2643),
             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,
@@ -82295,10 +82840,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 908, 925),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2599, 2607),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2623),
+            id: DeclarationId(2644),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82309,10 +82854,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 930, 932),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2612, 2617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2624),
+            id: DeclarationId(2645),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82323,10 +82868,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 937, 941),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2622, 2631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2625),
+            id: DeclarationId(2646),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82337,10 +82882,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 946, 951),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2636, 2640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2626),
+            id: DeclarationId(2647),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82351,12 +82896,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 956, 958),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2645, 2653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2627),
+            id: DeclarationId(2648),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(827),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82365,12 +82916,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 963, 965),
+            span: SourceSpan::new("src/v3/std/workflows.dag", 992, 1006),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2628),
+            id: DeclarationId(2649),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1035),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82379,12 +82936,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 970, 972),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11283, 11299),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2629),
+            id: DeclarationId(2650),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1041),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82393,12 +82956,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 977, 979),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15192, 15218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2630),
+            id: DeclarationId(2651),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "duration".to_string(),
+                    ty: DeclarationId(1229),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82407,10 +82975,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 984, 988),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 4130, 4164),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2631),
+            id: DeclarationId(2652),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82421,10 +82989,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 993, 998),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 4169, 4179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2632),
+            id: DeclarationId(2653),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82435,10 +83003,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1003, 1007),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 4184, 4193),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2633),
+            id: DeclarationId(2654),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82449,12 +83017,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1012, 1017),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 4198, 4203),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2634),
+            id: DeclarationId(2655),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1235),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82463,12 +83037,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1022, 1028),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7701, 7729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2635),
+            id: DeclarationId(2656),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "max".to_string(),
+                    ty: DeclarationId(1229),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82477,10 +83056,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1033, 1041),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9213, 9244),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2636),
+            id: DeclarationId(2657),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82491,12 +83070,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1046, 1051),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9249, 9265),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2637),
+            id: DeclarationId(2658),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(19),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(20),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82505,12 +83090,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1056, 1061),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18553, 18578),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2638),
+            id: DeclarationId(2659),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1084),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1085),
+                        value: DeclarationId(1230),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1086),
+                        value: DeclarationId(1236),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1087),
+                        value: DeclarationId(1237),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82519,12 +83120,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1066, 1074),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18895, 18971),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2639),
+            id: DeclarationId(2660),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1088),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1089),
+                        value: DeclarationId(1230),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1090),
+                        value: DeclarationId(1236),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1091),
+                        value: DeclarationId(1237),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82533,12 +83150,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1079, 1088),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 19082, 19158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2640),
+            id: DeclarationId(2661),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1833),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1035),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82547,12 +83170,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1093, 1096),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11283, 11299),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2641),
+            id: DeclarationId(2662),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2367),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82561,12 +83190,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1101, 1107),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15192, 15218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2642),
+            id: DeclarationId(2663),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2367),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82575,12 +83210,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1112, 1118),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15192, 15218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2643),
+            id: DeclarationId(2664),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2367),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82589,12 +83230,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1123, 1129),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15192, 15218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2644),
+            id: DeclarationId(2665),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2367),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82603,12 +83250,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1134, 1140),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15192, 15218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2645),
+            id: DeclarationId(2666),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2367),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82617,12 +83270,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1145, 1153),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15192, 15218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2646),
+            id: DeclarationId(2667),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2367),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82631,12 +83290,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1158, 1166),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15192, 15218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2647),
+            id: DeclarationId(2668),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2367),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82645,12 +83310,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1171, 1176),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15192, 15218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2648),
+            id: DeclarationId(2669),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2367),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82659,12 +83330,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1181, 1190),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15192, 15218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2649),
+            id: DeclarationId(2670),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2367),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82673,12 +83350,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1195, 1199),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15192, 15218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2650),
+            id: DeclarationId(2671),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2367),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82687,12 +83370,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1204, 1212),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15192, 15218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2651),
+            id: DeclarationId(2672),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1041),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82701,12 +83390,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1217, 1220),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3215, 3241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2652),
+            id: DeclarationId(2673),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1041),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82715,12 +83410,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1791, 1796),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4787, 4813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2653),
+            id: DeclarationId(2674),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(799),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82729,12 +83430,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1801, 1805),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5081, 5098),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2654),
+            id: DeclarationId(2675),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(827),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82743,12 +83450,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1810, 1816),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5149, 5163),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2655),
+            id: DeclarationId(2676),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(781),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82757,12 +83470,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1821, 1827),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5213, 5226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2656),
+            id: DeclarationId(2677),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(817),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82771,12 +83490,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1832, 1836),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5276, 5289),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2657),
+            id: DeclarationId(2678),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1039),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82785,12 +83510,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1841, 1847),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5337, 5353),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2658),
+            id: DeclarationId(2679),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1041),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82799,12 +83530,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1852, 1860),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5406, 5432),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2659),
+            id: DeclarationId(2680),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(2679),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82813,12 +83550,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1865, 1873),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5401, 5433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2660),
+            id: DeclarationId(2681),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1041),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82827,12 +83570,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1878, 1885),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5507, 5533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2661),
+            id: DeclarationId(2682),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(2681),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82841,12 +83590,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1890, 1896),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5502, 5534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2662),
+            id: DeclarationId(2683),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1039),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82855,12 +83610,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1901, 1908),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5659, 5675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2663),
+            id: DeclarationId(2684),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1044),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1045),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82869,12 +83630,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1913, 1919),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5800, 5834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2664),
+            id: DeclarationId(2685),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1044),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1045),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82883,12 +83650,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1924, 1931),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6046, 6080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2665),
+            id: DeclarationId(2686),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1044),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1045),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82897,12 +83670,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2371, 2373),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6565, 6599),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2666),
+            id: DeclarationId(2687),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1044),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1045),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82911,12 +83690,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2378, 2382),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6826, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2667),
+            id: DeclarationId(2688),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1044),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1045),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82925,12 +83710,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2387, 2392),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7116, 7150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2668),
+            id: DeclarationId(2689),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1041),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82939,12 +83730,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2397, 2399),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7330, 7356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2669),
+            id: DeclarationId(2690),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1044),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1045),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82953,12 +83750,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2404, 2406),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7361, 7395),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2670),
+            id: DeclarationId(2691),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1044),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1045),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82967,12 +83770,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2411, 2413),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8630, 8664),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2671),
+            id: DeclarationId(2692),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1092),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1093),
+                        value: DeclarationId(1230),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1094),
+                        value: DeclarationId(1236),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1095),
+                        value: DeclarationId(1237),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82981,12 +83800,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2418, 2420),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 10623, 10703),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2672),
+            id: DeclarationId(2693),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2367),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82995,12 +83820,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2425, 2429),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3215, 3241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2673),
+            id: DeclarationId(2694),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2367),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -83009,12 +83840,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2434, 2439),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3215, 3241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2674),
+            id: DeclarationId(2695),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2367),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -83023,12 +83860,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2444, 2448),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3215, 3241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2675),
+            id: DeclarationId(2696),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2367),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -83037,12 +83880,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2453, 2458),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3215, 3241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2676),
+            id: DeclarationId(2697),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2367),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -83051,12 +83900,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2463, 2469),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3215, 3241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2677),
+            id: DeclarationId(2698),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2367),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -83065,12 +83920,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2474, 2482),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3215, 3241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2678),
+            id: DeclarationId(2699),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2367),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -83079,12 +83940,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2487, 2492),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3215, 3241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2679),
+            id: DeclarationId(2700),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2367),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -83093,12 +83960,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2497, 2502),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3215, 3241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2680),
+            id: DeclarationId(2701),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2367),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -83107,12 +83980,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2507, 2515),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3215, 3241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2681),
+            id: DeclarationId(2702),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2367),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -83121,12 +84000,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2520, 2529),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3215, 3241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2682),
+            id: DeclarationId(2703),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1833),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(799),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -83135,12 +84020,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2534, 2537),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5081, 5098),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2683),
+            id: DeclarationId(2704),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1833),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(827),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -83149,12 +84040,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2542, 2548),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5149, 5163),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2684),
+            id: DeclarationId(2705),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1833),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(781),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -83163,12 +84060,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2553, 2559),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5213, 5226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2685),
+            id: DeclarationId(2706),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1833),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(817),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -83177,12 +84080,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2564, 2570),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5276, 5289),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2686),
+            id: DeclarationId(2707),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1833),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1039),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -83191,12 +84100,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2575, 2581),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5337, 5353),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2687),
+            id: DeclarationId(2708),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1833),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(2679),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -83205,12 +84120,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2586, 2594),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5401, 5433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2688),
+            id: DeclarationId(2709),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1835),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(2681),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -83219,12 +84140,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2599, 2607),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5502, 5534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2689),
+            id: DeclarationId(2710),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2367),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -83233,12 +84160,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2612, 2617),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5507, 5533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2690),
+            id: DeclarationId(2711),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1835),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1039),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -83247,12 +84180,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2622, 2631),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5659, 5675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2691),
+            id: DeclarationId(2712),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2373),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1045),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -83261,12 +84200,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2636, 2640),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5800, 5834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2692),
+            id: DeclarationId(2713),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2377),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1045),
+                    value: DeclarationId(1230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -83275,16 +84220,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2645, 2653),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6046, 6080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2693),
+            id: DeclarationId(2714),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1174),
+                    value: DeclarationId(948),
                 }],
             },
             type_params: vec![],
@@ -83298,13 +84243,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 27585, 27608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2694),
+            id: DeclarationId(2715),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1301),
+                    value: DeclarationId(1316),
                 }],
             },
             type_params: vec![],
@@ -83318,13 +84263,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 28677, 28693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2695),
+            id: DeclarationId(2716),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1303),
+                    value: DeclarationId(1318),
                 }],
             },
             type_params: vec![],
@@ -83338,7 +84283,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 28698, 28718),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2696),
+            id: DeclarationId(2717),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83352,7 +84297,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2826, 2840),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2697),
+            id: DeclarationId(2718),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83366,7 +84311,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2845, 2855),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2698),
+            id: DeclarationId(2719),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83380,7 +84325,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(2720),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83394,7 +84339,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(2721),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83408,7 +84353,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(2722),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83422,7 +84367,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(2723),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83436,7 +84381,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(2724),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83450,7 +84395,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(2725),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83464,7 +84409,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(2726),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83478,7 +84423,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(2727),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83492,7 +84437,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3439, 3448),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2707),
+            id: DeclarationId(2728),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -83511,7 +84456,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3453, 3469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2708),
+            id: DeclarationId(2729),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83525,7 +84470,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4128, 4136),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2709),
+            id: DeclarationId(2730),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83539,7 +84484,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4141, 4151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2710),
+            id: DeclarationId(2731),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83553,7 +84498,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4376, 4388),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2711),
+            id: DeclarationId(2732),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83567,7 +84512,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5203, 5216),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2712),
+            id: DeclarationId(2733),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83581,7 +84526,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5221, 5234),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2713),
+            id: DeclarationId(2734),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83595,7 +84540,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5239, 5247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2714),
+            id: DeclarationId(2735),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83620,12 +84565,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5792, 5859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2715),
+            id: DeclarationId(2736),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "var".to_string(),
-                    ty: DeclarationId(1286),
+                    ty: DeclarationId(1301),
                 }],
             },
             type_params: vec![],
@@ -83639,7 +84584,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5900, 5953),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2716),
+            id: DeclarationId(2737),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83653,7 +84598,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5986, 6015),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2717),
+            id: DeclarationId(2738),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83667,7 +84612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6617, 6649),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2718),
+            id: DeclarationId(2739),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83681,7 +84626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6654, 6685),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2719),
+            id: DeclarationId(2740),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83695,7 +84640,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6727, 6759),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2720),
+            id: DeclarationId(2741),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83709,7 +84654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6764, 6795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2721),
+            id: DeclarationId(2742),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83723,7 +84668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6800, 6828),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2722),
+            id: DeclarationId(2743),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83737,7 +84682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6833, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2723),
+            id: DeclarationId(2744),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83751,7 +84696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6898, 6920),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2724),
+            id: DeclarationId(2745),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83765,7 +84710,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6925, 6953),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2725),
+            id: DeclarationId(2746),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83779,7 +84724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6958, 6987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2726),
+            id: DeclarationId(2747),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83793,12 +84738,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 9797, 9805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2727),
+            id: DeclarationId(2748),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1279),
+                    ty: DeclarationId(1294),
                 }],
             },
             type_params: vec![],
@@ -83812,7 +84757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 9810, 9850),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2728),
+            id: DeclarationId(2749),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -83831,7 +84776,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 9855, 9888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2729),
+            id: DeclarationId(2750),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83841,7 +84786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "state".to_string(),
-                        ty: DeclarationId(1280),
+                        ty: DeclarationId(1295),
                     },
                 ],
             },
@@ -83856,7 +84801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 9893, 9971),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2730),
+            id: DeclarationId(2751),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -83875,7 +84820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 10137, 10200),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2731),
+            id: DeclarationId(2752),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83904,21 +84849,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 10205, 10296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2732),
+            id: DeclarationId(2753),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                     Field {
                         label: "input_sample".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                     Field {
                         label: "expected_output".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                 ],
             },
@@ -83933,17 +84878,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 10301, 10433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2733),
+            id: DeclarationId(2754),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                     Field {
                         label: "invariant".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                 ],
             },
@@ -83958,7 +84903,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 10648, 10737),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2734),
+            id: DeclarationId(2755),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -83978,7 +84923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 11537, 11549),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2735),
+            id: DeclarationId(2756),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83988,7 +84933,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2734),
+                        ty: DeclarationId(2755),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -84007,7 +84952,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 11486, 11583),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2736),
+            id: DeclarationId(2757),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -84027,7 +84972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 12298, 12310),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2737),
+            id: DeclarationId(2758),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84037,7 +84982,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2736),
+                        ty: DeclarationId(2757),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -84045,7 +84990,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "input_ref".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                 ],
             },
@@ -84060,21 +85005,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 12248, 12376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2738),
+            id: DeclarationId(2759),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "lens_ref".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                     Field {
                         label: "input_ref".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                     Field {
                         label: "expected_ref".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                 ],
             },
@@ -84089,21 +85034,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 12674, 12796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2739),
+            id: DeclarationId(2760),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject_ref".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                     Field {
                         label: "oracle_ref".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                     Field {
                         label: "input_ref".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                 ],
             },
@@ -84118,12 +85063,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 13058, 13183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2740),
+            id: DeclarationId(2761),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "expected".to_string(),
-                    ty: DeclarationId(1316),
+                    ty: DeclarationId(1330),
                 }],
             },
             type_params: vec![],
@@ -84137,17 +85082,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 15236, 15297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2741),
+            id: DeclarationId(2762),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "expected".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                     Field {
                         label: "param".to_string(),
-                        ty: DeclarationId(1287),
+                        ty: DeclarationId(1302),
                     },
                 ],
             },
@@ -84162,21 +85107,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 15302, 15401),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2742),
+            id: DeclarationId(2763),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                     Field {
                         label: "comparator".to_string(),
-                        ty: DeclarationId(1281),
+                        ty: DeclarationId(1296),
                     },
                     Field {
                         label: "baseline_ref".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                 ],
             },
@@ -84191,17 +85136,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 15755, 15887),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2743),
+            id: DeclarationId(2764),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "left_report_ref".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                     Field {
                         label: "right_report_ref".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                 ],
             },
@@ -84216,17 +85161,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 16454, 16566),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2744),
+            id: DeclarationId(2765),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "law".to_string(),
-                        ty: DeclarationId(1282),
+                        ty: DeclarationId(1297),
                     },
                     Field {
                         label: "lens_ref".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                 ],
             },
@@ -84241,17 +85186,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 17263, 17342),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2745),
+            id: DeclarationId(2766),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                     Field {
                         label: "list_constant".to_string(),
-                        ty: DeclarationId(1268),
+                        ty: DeclarationId(1283),
                     },
                     Field {
                         label: "bound".to_string(),
@@ -84270,21 +85215,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 17562, 17675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2746),
+            id: DeclarationId(2767),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                     Field {
                         label: "list_constant".to_string(),
-                        ty: DeclarationId(1268),
+                        ty: DeclarationId(1283),
                     },
                     Field {
                         label: "subset_predicate".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                 ],
             },
@@ -84299,17 +85244,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 17680, 17816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2747),
+            id: DeclarationId(2768),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "compile_target".to_string(),
-                        ty: DeclarationId(1266),
+                        ty: DeclarationId(1281),
                     },
                     Field {
                         label: "expected".to_string(),
-                        ty: DeclarationId(1267),
+                        ty: DeclarationId(1282),
                     },
                 ],
             },
@@ -84324,17 +85269,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 18302, 18384),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2748),
+            id: DeclarationId(2769),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                     Field {
                         label: "ratchet_kind".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                 ],
             },
@@ -84349,13 +85294,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 18389, 18475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2749),
+            id: DeclarationId(2770),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1266),
+                    value: DeclarationId(1281),
                 }],
             },
             type_params: vec![],
@@ -84369,17 +85314,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 18554, 18564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2750),
+            id: DeclarationId(2771),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                     Field {
                         label: "generated_paths".to_string(),
-                        ty: DeclarationId(2749),
+                        ty: DeclarationId(2770),
                     },
                 ],
             },
@@ -84394,17 +85339,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 18480, 18570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2751),
+            id: DeclarationId(2772),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "capability_register".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                     Field {
                         label: "cementing_receipts".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                 ],
             },
@@ -84419,21 +85364,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 19784, 19909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2752),
+            id: DeclarationId(2773),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "deferred_gate".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                     Field {
                         label: "target_lane".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                     Field {
                         label: "authority_doc".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                 ],
             },
@@ -84448,21 +85393,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 20851, 20985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2753),
+            id: DeclarationId(2774),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "deferred_gate".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                     Field {
                         label: "target_lane".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                     Field {
                         label: "authority_doc".to_string(),
-                        ty: DeclarationId(1316),
+                        ty: DeclarationId(1330),
                     },
                 ],
             },
@@ -84477,12 +85422,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 21624, 21768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2754),
+            id: DeclarationId(2775),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "ledger".to_string(),
-                    ty: DeclarationId(918),
+                    ty: DeclarationId(868),
                 }],
             },
             type_params: vec![],
@@ -84496,13 +85441,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 22613, 22667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2755),
+            id: DeclarationId(2776),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1174),
+                    value: DeclarationId(948),
                 }],
             },
             type_params: vec![],
@@ -84516,7 +85461,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 23711, 23734),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2756),
+            id: DeclarationId(2777),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84530,7 +85475,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 23937, 23943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2757),
+            id: DeclarationId(2778),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84544,13 +85489,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 23948, 23954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2758),
+            id: DeclarationId(2779),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1174),
+                    value: DeclarationId(948),
                 }],
             },
             type_params: vec![],
@@ -84564,12 +85509,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 24092, 24115),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2759),
+            id: DeclarationId(2780),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1296),
+                    ty: DeclarationId(1311),
                 }],
             },
             type_params: vec![],
@@ -84583,12 +85528,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 25838, 25867),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2760),
+            id: DeclarationId(2781),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1298),
+                    ty: DeclarationId(1313),
                 }],
             },
             type_params: vec![],
@@ -84602,12 +85547,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 25872, 25911),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2761),
+            id: DeclarationId(2782),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1296),
+                    ty: DeclarationId(1311),
                 }],
             },
             type_params: vec![],
@@ -84621,12 +85566,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 26769, 26790),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2762),
+            id: DeclarationId(2783),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1298),
+                    ty: DeclarationId(1313),
                 }],
             },
             type_params: vec![],
@@ -84640,13 +85585,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 26795, 26826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2763),
+            id: DeclarationId(2784),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1301),
+                    value: DeclarationId(1316),
                 }],
             },
             type_params: vec![],
@@ -84660,13 +85605,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 26870, 26886),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2764),
+            id: DeclarationId(2785),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1174),
+                    value: DeclarationId(948),
                 }],
             },
             type_params: vec![],
@@ -84680,13 +85625,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 27142, 27165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2765),
+            id: DeclarationId(2786),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1291),
+                    value: DeclarationId(1306),
                 }],
             },
             type_params: vec![],
@@ -84700,27 +85645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 7221, 7252),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2766),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(827),
-                }],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/workflows.dag", 992, 1006),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2767),
+            id: DeclarationId(2787),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84734,7 +85659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 532, 547),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2768),
+            id: DeclarationId(2788),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84748,7 +85673,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 550, 561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2769),
+            id: DeclarationId(2789),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84762,7 +85687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 564, 576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2770),
+            id: DeclarationId(2790),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -84781,7 +85706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2771),
+            id: DeclarationId(2791),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84795,7 +85720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6428, 6446),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2772),
+            id: DeclarationId(2792),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84809,7 +85734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6451, 6466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2773),
+            id: DeclarationId(2793),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84823,7 +85748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6495, 6518),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2774),
+            id: DeclarationId(2794),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84837,7 +85762,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6523, 6544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2775),
+            id: DeclarationId(2795),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84851,7 +85776,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6549, 6564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2776),
+            id: DeclarationId(2796),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84865,7 +85790,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8177, 8187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2777),
+            id: DeclarationId(2797),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84879,7 +85804,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8192, 8203),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2778),
+            id: DeclarationId(2798),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84893,7 +85818,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8208, 8221),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2779),
+            id: DeclarationId(2799),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84907,7 +85832,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8226, 8239),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2780),
+            id: DeclarationId(2800),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84921,7 +85846,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8244, 8257),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2781),
+            id: DeclarationId(2801),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84935,7 +85860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8262, 8276),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2782),
+            id: DeclarationId(2802),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84949,7 +85874,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8281, 8296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2783),
+            id: DeclarationId(2803),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84963,7 +85888,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9038, 9055),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2784),
+            id: DeclarationId(2804),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84977,7 +85902,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9060, 9070),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2785),
+            id: DeclarationId(2805),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84991,7 +85916,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9075, 9079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2786),
+            id: DeclarationId(2806),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -85001,11 +85926,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1723),
+                        ty: DeclarationId(1737),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1725),
+                        ty: DeclarationId(1739),
                     },
                     Field {
                         label: "range_min_inclusive".to_string(),
@@ -85021,7 +85946,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "overflow".to_string(),
-                        ty: DeclarationId(1726),
+                        ty: DeclarationId(1740),
                     },
                 ],
             },
@@ -85036,7 +85961,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9857, 10429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2787),
+            id: DeclarationId(2807),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -85046,11 +85971,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1724),
+                        ty: DeclarationId(1738),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1725),
+                        ty: DeclarationId(1739),
                     },
                     Field {
                         label: "is_copy".to_string(),
@@ -85069,13 +85994,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10434, 10616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2788),
+            id: DeclarationId(2808),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1727),
+                    value: DeclarationId(1741),
                 }],
             },
             type_params: vec![],
@@ -85089,7 +86014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10965, 10984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2789),
+            id: DeclarationId(2809),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85103,7 +86028,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4233, 4241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2790),
+            id: DeclarationId(2810),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -85122,7 +86047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4246, 4277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2791),
+            id: DeclarationId(2811),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -85142,12 +86067,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4299, 4319),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2792),
+            id: DeclarationId(2812),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "values".to_string(),
-                    ty: DeclarationId(2791),
+                    ty: DeclarationId(2811),
                 }],
             },
             type_params: vec![],
@@ -85161,7 +86086,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4282, 4321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2793),
+            id: DeclarationId(2813),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -85186,7 +86111,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4326, 4379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2794),
+            id: DeclarationId(2814),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -85211,7 +86136,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4384, 4433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2795),
+            id: DeclarationId(2815),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85225,7 +86150,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 847, 851),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2796),
+            id: DeclarationId(2816),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85239,7 +86164,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 854, 857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2797),
+            id: DeclarationId(2817),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85253,13 +86178,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 860, 872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2798),
+            id: DeclarationId(2818),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1739),
+                    value: DeclarationId(1753),
                 }],
             },
             type_params: vec![],
@@ -85273,7 +86198,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1242, 1259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2799),
+            id: DeclarationId(2819),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -85292,7 +86217,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2800),
+            id: DeclarationId(2820),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85306,7 +86231,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1309, 1318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2801),
+            id: DeclarationId(2821),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85320,7 +86245,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1323, 1332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2802),
+            id: DeclarationId(2822),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85334,7 +86259,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1337, 1350),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2803),
+            id: DeclarationId(2823),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85348,7 +86273,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1355, 1367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2804),
+            id: DeclarationId(2824),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85362,7 +86287,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1372, 1385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2805),
+            id: DeclarationId(2825),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -85381,7 +86306,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2806),
+            id: DeclarationId(2826),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85395,7 +86320,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1677, 1685),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2807),
+            id: DeclarationId(2827),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85409,7 +86334,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1688, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2808),
+            id: DeclarationId(2828),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85423,13 +86348,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1700, 1709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2809),
+            id: DeclarationId(2829),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1748),
+                    value: DeclarationId(1762),
                 }],
             },
             type_params: vec![],
@@ -85443,11 +86368,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1521, 1542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2810),
+            id: DeclarationId(2830),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1757),
+                    DeclarationId(1771),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -85462,13 +86387,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2811),
+            id: DeclarationId(2831),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1754),
+                    value: DeclarationId(1768),
                 }],
             },
             type_params: vec![],
@@ -85482,7 +86407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1583, 1592),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2812),
+            id: DeclarationId(2832),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -85508,11 +86433,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2813),
+            id: DeclarationId(2833),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2812),
+                    DeclarationId(2832),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -85527,11 +86452,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2814),
+            id: DeclarationId(2834),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1746),
+                    DeclarationId(1760),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -85546,7 +86471,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2815),
+            id: DeclarationId(2835),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85560,7 +86485,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1917, 1925),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2816),
+            id: DeclarationId(2836),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85574,7 +86499,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1928, 1937),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2817),
+            id: DeclarationId(2837),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85588,7 +86513,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1940, 1948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2818),
+            id: DeclarationId(2838),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -85608,7 +86533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2106, 2118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2819),
+            id: DeclarationId(2839),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -85628,17 +86553,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2127, 2139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2820),
+            id: DeclarationId(2840),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "branches".to_string(),
-                        ty: DeclarationId(2818),
+                        ty: DeclarationId(2838),
                     },
                     Field {
                         label: "paths".to_string(),
-                        ty: DeclarationId(2819),
+                        ty: DeclarationId(2839),
                     },
                 ],
             },
@@ -85653,7 +86578,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2089, 2141),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2821),
+            id: DeclarationId(2841),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -85673,13 +86598,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2170, 2182),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2822),
+            id: DeclarationId(2842),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1749),
+                    value: DeclarationId(1763),
                 }],
             },
             type_params: vec![],
@@ -85693,17 +86618,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2191, 2216),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2823),
+            id: DeclarationId(2843),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "branches".to_string(),
-                        ty: DeclarationId(2821),
+                        ty: DeclarationId(2841),
                     },
                     Field {
                         label: "types".to_string(),
-                        ty: DeclarationId(2822),
+                        ty: DeclarationId(2842),
                     },
                 ],
             },
@@ -85718,12 +86643,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2146, 2218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2824),
+            id: DeclarationId(2844),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "cron".to_string(),
-                    ty: DeclarationId(1730),
+                    ty: DeclarationId(1744),
                 }],
             },
             type_params: vec![],
@@ -85737,13 +86662,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2223, 2254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2825),
+            id: DeclarationId(2845),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1750),
+                    value: DeclarationId(1764),
                 }],
             },
             type_params: vec![],
@@ -85757,12 +86682,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2286, 2305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2826),
+            id: DeclarationId(2846),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "inputs".to_string(),
-                    ty: DeclarationId(2825),
+                    ty: DeclarationId(2845),
                 }],
             },
             type_params: vec![],
@@ -85776,13 +86701,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2259, 2307),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2827),
+            id: DeclarationId(2847),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1750),
+                    value: DeclarationId(1764),
                 }],
             },
             type_params: vec![],
@@ -85796,12 +86721,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2335, 2354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2828),
+            id: DeclarationId(2848),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "inputs".to_string(),
-                    ty: DeclarationId(2827),
+                    ty: DeclarationId(2847),
                 }],
             },
             type_params: vec![],
@@ -85815,7 +86740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2312, 2356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2829),
+            id: DeclarationId(2849),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85829,7 +86754,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2387, 2393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2830),
+            id: DeclarationId(2850),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85843,7 +86768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2398, 2409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2831),
+            id: DeclarationId(2851),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85857,7 +86782,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2414, 2422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2832),
+            id: DeclarationId(2852),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85871,7 +86796,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2427, 2441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2833),
+            id: DeclarationId(2853),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85885,7 +86810,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2446, 2452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2834),
+            id: DeclarationId(2854),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -85904,7 +86829,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2835),
+            id: DeclarationId(2855),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -85923,7 +86848,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(2856),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85937,7 +86862,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(2857),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85951,7 +86876,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(2858),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85965,7 +86890,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(2859),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85979,7 +86904,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(2860),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85993,7 +86918,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(2861),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86007,7 +86932,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(2862),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86021,7 +86946,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4807, 4820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2843),
+            id: DeclarationId(2863),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86040,13 +86965,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2844),
+            id: DeclarationId(2864),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1760),
+                    value: DeclarationId(1774),
                 }],
             },
             type_params: vec![],
@@ -86060,7 +86985,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5372, 5382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2845),
+            id: DeclarationId(2865),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -86080,7 +87005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5392, 5404),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2846),
+            id: DeclarationId(2866),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -86106,11 +87031,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2847),
+            id: DeclarationId(2867),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2846),
+                    DeclarationId(2866),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86125,7 +87050,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2848),
+            id: DeclarationId(2868),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -86151,11 +87076,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2849),
+            id: DeclarationId(2869),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2848),
+                    DeclarationId(2868),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86170,7 +87095,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2850),
+            id: DeclarationId(2870),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86189,11 +87114,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2851),
+            id: DeclarationId(2871),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1776),
+                    DeclarationId(1790),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86208,7 +87133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2852),
+            id: DeclarationId(2872),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86227,11 +87152,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2853),
+            id: DeclarationId(2873),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1757),
+                    DeclarationId(1771),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86246,7 +87171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2854),
+            id: DeclarationId(2874),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86265,7 +87190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6619, 6655),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2855),
+            id: DeclarationId(2875),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86284,7 +87209,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6660, 6709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2856),
+            id: DeclarationId(2876),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86298,7 +87223,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7555, 7584),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2857),
+            id: DeclarationId(2877),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86317,7 +87242,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7589, 7646),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2858),
+            id: DeclarationId(2878),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86336,11 +87261,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8224, 8259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2859),
+            id: DeclarationId(2879),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1756),
+                    DeclarationId(1770),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86355,7 +87280,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2860),
+            id: DeclarationId(2880),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -86365,7 +87290,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "cancel_in_progress".to_string(),
-                        ty: DeclarationId(2859),
+                        ty: DeclarationId(2879),
                     },
                 ],
             },
@@ -86380,11 +87305,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8264, 8453),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2861),
+            id: DeclarationId(2881),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1755),
+                    DeclarationId(1769),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86399,7 +87324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2862),
+            id: DeclarationId(2882),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86418,7 +87343,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2863),
+            id: DeclarationId(2883),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -86428,11 +87353,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "cancel_in_progress".to_string(),
-                        ty: DeclarationId(2861),
+                        ty: DeclarationId(2881),
                     },
                     Field {
                         label: "explicit_single".to_string(),
-                        ty: DeclarationId(2862),
+                        ty: DeclarationId(2882),
                     },
                 ],
             },
@@ -86447,12 +87372,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8458, 8845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2864),
+            id: DeclarationId(2884),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "label".to_string(),
-                    ty: DeclarationId(1759),
+                    ty: DeclarationId(1773),
                 }],
             },
             type_params: vec![],
@@ -86466,7 +87391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10037, 10072),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2865),
+            id: DeclarationId(2885),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -86486,12 +87411,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10098, 10110),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2866),
+            id: DeclarationId(2886),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "labels".to_string(),
-                    ty: DeclarationId(2865),
+                    ty: DeclarationId(2885),
                 }],
             },
             type_params: vec![],
@@ -86505,7 +87430,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10077, 10112),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2867),
+            id: DeclarationId(2887),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86524,7 +87449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10201, 10240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2868),
+            id: DeclarationId(2888),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86538,7 +87463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10263, 10275),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2869),
+            id: DeclarationId(2889),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86552,7 +87477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10280, 10290),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2870),
+            id: DeclarationId(2890),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86566,7 +87491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10295, 10305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2871),
+            id: DeclarationId(2891),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86580,7 +87505,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10310, 10321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2872),
+            id: DeclarationId(2892),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86594,7 +87519,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10326, 10333),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2873),
+            id: DeclarationId(2893),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86608,7 +87533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10338, 10351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2874),
+            id: DeclarationId(2894),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86627,7 +87552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2875),
+            id: DeclarationId(2895),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86646,7 +87571,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2876),
+            id: DeclarationId(2896),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -86672,11 +87597,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10633),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2877),
+            id: DeclarationId(2897),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2876),
+                    DeclarationId(2896),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86691,7 +87616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2878),
+            id: DeclarationId(2898),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86710,7 +87635,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2879),
+            id: DeclarationId(2899),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86729,7 +87654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2880),
+            id: DeclarationId(2900),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86748,17 +87673,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2881),
+            id: DeclarationId(2901),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(2874),
+                        ty: DeclarationId(2894),
                     },
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(2875),
+                        ty: DeclarationId(2895),
                     },
                     Field {
                         label: "run".to_string(),
@@ -86766,19 +87691,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "shell".to_string(),
-                        ty: DeclarationId(1761),
+                        ty: DeclarationId(1775),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2877),
+                        ty: DeclarationId(2897),
                     },
                     Field {
                         label: "working_directory".to_string(),
-                        ty: DeclarationId(2878),
+                        ty: DeclarationId(2898),
                     },
                     Field {
                         label: "if_condition".to_string(),
-                        ty: DeclarationId(2879),
+                        ty: DeclarationId(2899),
                     },
                     Field {
                         label: "continue_on_error".to_string(),
@@ -86786,7 +87711,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "timeout_minutes".to_string(),
-                        ty: DeclarationId(2880),
+                        ty: DeclarationId(2900),
                     },
                 ],
             },
@@ -86801,7 +87726,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10510, 10763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2882),
+            id: DeclarationId(2902),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86820,7 +87745,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2883),
+            id: DeclarationId(2903),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86839,7 +87764,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2884),
+            id: DeclarationId(2904),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -86865,11 +87790,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2885),
+            id: DeclarationId(2905),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2884),
+                    DeclarationId(2904),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86884,7 +87809,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2886),
+            id: DeclarationId(2906),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -86910,11 +87835,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10995),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2887),
+            id: DeclarationId(2907),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2886),
+                    DeclarationId(2906),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86929,7 +87854,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2888),
+            id: DeclarationId(2908),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86948,7 +87873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2889),
+            id: DeclarationId(2909),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86967,33 +87892,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2890),
+            id: DeclarationId(2910),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(2882),
+                        ty: DeclarationId(2902),
                     },
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(2883),
+                        ty: DeclarationId(2903),
                     },
                     Field {
                         label: "uses".to_string(),
-                        ty: DeclarationId(1762),
+                        ty: DeclarationId(1776),
                     },
                     Field {
                         label: "with".to_string(),
-                        ty: DeclarationId(2885),
+                        ty: DeclarationId(2905),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2887),
+                        ty: DeclarationId(2907),
                     },
                     Field {
                         label: "if_condition".to_string(),
-                        ty: DeclarationId(2888),
+                        ty: DeclarationId(2908),
                     },
                     Field {
                         label: "continue_on_error".to_string(),
@@ -87001,7 +87926,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "timeout_minutes".to_string(),
-                        ty: DeclarationId(2889),
+                        ty: DeclarationId(2909),
                     },
                 ],
             },
@@ -87016,7 +87941,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10768, 11091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2891),
+            id: DeclarationId(2911),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87030,7 +87955,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11110, 11114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2892),
+            id: DeclarationId(2912),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87044,7 +87969,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11117, 11119),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2893),
+            id: DeclarationId(2913),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87058,7 +87983,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11122, 11126),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2894),
+            id: DeclarationId(2914),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87072,7 +87997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11129, 11135),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2895),
+            id: DeclarationId(2915),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87086,7 +88011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11138, 11141),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2896),
+            id: DeclarationId(2916),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87105,7 +88030,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2897),
+            id: DeclarationId(2917),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87124,7 +88049,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2898),
+            id: DeclarationId(2918),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87143,7 +88068,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2899),
+            id: DeclarationId(2919),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -87153,15 +88078,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "file".to_string(),
-                        ty: DeclarationId(2896),
+                        ty: DeclarationId(2916),
                     },
                     Field {
                         label: "line".to_string(),
-                        ty: DeclarationId(2897),
+                        ty: DeclarationId(2917),
                     },
                     Field {
                         label: "col".to_string(),
-                        ty: DeclarationId(2898),
+                        ty: DeclarationId(2918),
                     },
                 ],
             },
@@ -87176,7 +88101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11463, 11536),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2900),
+            id: DeclarationId(2920),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87195,7 +88120,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2901),
+            id: DeclarationId(2921),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87214,7 +88139,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2902),
+            id: DeclarationId(2922),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87233,7 +88158,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2903),
+            id: DeclarationId(2923),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -87243,15 +88168,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "file".to_string(),
-                        ty: DeclarationId(2900),
+                        ty: DeclarationId(2920),
                     },
                     Field {
                         label: "line".to_string(),
-                        ty: DeclarationId(2901),
+                        ty: DeclarationId(2921),
                     },
                     Field {
                         label: "col".to_string(),
-                        ty: DeclarationId(2902),
+                        ty: DeclarationId(2922),
                     },
                 ],
             },
@@ -87266,7 +88191,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11541, 11616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2904),
+            id: DeclarationId(2924),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87285,7 +88210,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2905),
+            id: DeclarationId(2925),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87304,7 +88229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2906),
+            id: DeclarationId(2926),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87323,7 +88248,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11689, 11693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2907),
+            id: DeclarationId(2927),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -87333,15 +88258,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "file".to_string(),
-                        ty: DeclarationId(2904),
+                        ty: DeclarationId(2924),
                     },
                     Field {
                         label: "line".to_string(),
-                        ty: DeclarationId(2905),
+                        ty: DeclarationId(2925),
                     },
                     Field {
                         label: "col".to_string(),
-                        ty: DeclarationId(2906),
+                        ty: DeclarationId(2926),
                     },
                 ],
             },
@@ -87356,7 +88281,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11621, 11695),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2908),
+            id: DeclarationId(2928),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87375,7 +88300,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11700, 11733),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2909),
+            id: DeclarationId(2929),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87389,7 +88314,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11738, 11756),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2910),
+            id: DeclarationId(2930),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -87414,7 +88339,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11761, 11802),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2911),
+            id: DeclarationId(2931),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87433,7 +88358,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11807, 11832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2912),
+            id: DeclarationId(2932),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87452,7 +88377,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11837, 11867),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2913),
+            id: DeclarationId(2933),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87471,7 +88396,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12673, 12677),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2914),
+            id: DeclarationId(2934),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -87485,11 +88410,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "retention_days".to_string(),
-                        ty: DeclarationId(2913),
+                        ty: DeclarationId(2933),
                     },
                     Field {
                         label: "if_no_files_found".to_string(),
-                        ty: DeclarationId(1773),
+                        ty: DeclarationId(1787),
                     },
                 ],
             },
@@ -87504,7 +88429,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12620, 12720),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2915),
+            id: DeclarationId(2935),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87523,7 +88448,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2916),
+            id: DeclarationId(2936),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -87533,7 +88458,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(2915),
+                        ty: DeclarationId(2935),
                     },
                 ],
             },
@@ -87548,7 +88473,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12725, 12765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2917),
+            id: DeclarationId(2937),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87562,7 +88487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12795, 12799),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2918),
+            id: DeclarationId(2938),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87576,7 +88501,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12802, 12810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2919),
+            id: DeclarationId(2939),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87590,7 +88515,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12813, 12819),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2920),
+            id: DeclarationId(2940),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -87610,7 +88535,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13281, 13293),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2921),
+            id: DeclarationId(2941),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -87621,7 +88546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(139),
-                        value: DeclarationId(2920),
+                        value: DeclarationId(2940),
                     },
                 ],
             },
@@ -87636,7 +88561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13269, 13294),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2922),
+            id: DeclarationId(2942),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -87662,13 +88587,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13311, 13330),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2923),
+            id: DeclarationId(2943),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2922),
+                    value: DeclarationId(2942),
                 }],
             },
             type_params: vec![],
@@ -87682,7 +88607,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13306, 13331),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2924),
+            id: DeclarationId(2944),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -87708,13 +88633,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13348, 13367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2925),
+            id: DeclarationId(2945),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2924),
+                    value: DeclarationId(2944),
                 }],
             },
             type_params: vec![],
@@ -87728,7 +88653,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13343, 13368),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2926),
+            id: DeclarationId(2946),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87747,7 +88672,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13403, 13407),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2927),
+            id: DeclarationId(2947),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87761,7 +88686,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13563, 13570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2928),
+            id: DeclarationId(2948),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87775,7 +88700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13575, 13582),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2929),
+            id: DeclarationId(2949),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87789,7 +88714,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13587, 13596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2930),
+            id: DeclarationId(2950),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87803,7 +88728,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13601, 13608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2931),
+            id: DeclarationId(2951),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87817,7 +88742,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13613, 13621),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2932),
+            id: DeclarationId(2952),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87831,7 +88756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13626, 13640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2933),
+            id: DeclarationId(2953),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87845,7 +88770,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1935, 1959),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2934),
+            id: DeclarationId(2954),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87859,12 +88784,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1964, 1989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2935),
+            id: DeclarationId(2955),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(151)],
                 output: DeclarationId(128),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(855))),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(887))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -87877,7 +88802,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2673, 2714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2936),
+            id: DeclarationId(2956),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87896,7 +88821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2937),
+            id: DeclarationId(2957),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87910,17 +88835,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2938),
+            id: DeclarationId(2958),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2936),
+                        ty: DeclarationId(2956),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2937),
+                        ty: DeclarationId(2957),
                     },
                 ],
             },
@@ -87935,7 +88860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2939),
+            id: DeclarationId(2959),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87954,7 +88879,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2940),
+            id: DeclarationId(2960),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87968,17 +88893,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2941),
+            id: DeclarationId(2961),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2939),
+                        ty: DeclarationId(2959),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2940),
+                        ty: DeclarationId(2960),
                     },
                 ],
             },
@@ -87993,7 +88918,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2942),
+            id: DeclarationId(2962),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88012,7 +88937,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2943),
+            id: DeclarationId(2963),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88026,17 +88951,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2944),
+            id: DeclarationId(2964),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2942),
+                        ty: DeclarationId(2962),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2943),
+                        ty: DeclarationId(2963),
                     },
                 ],
             },
@@ -88051,7 +88976,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2945),
+            id: DeclarationId(2965),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88070,7 +88995,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2946),
+            id: DeclarationId(2966),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88084,17 +89009,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2947),
+            id: DeclarationId(2967),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2945),
+                        ty: DeclarationId(2965),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2946),
+                        ty: DeclarationId(2966),
                     },
                 ],
             },
@@ -88109,7 +89034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2948),
+            id: DeclarationId(2968),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88128,7 +89053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2949),
+            id: DeclarationId(2969),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88142,17 +89067,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2950),
+            id: DeclarationId(2970),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2948),
+                        ty: DeclarationId(2968),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2949),
+                        ty: DeclarationId(2969),
                     },
                 ],
             },
@@ -88167,7 +89092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2951),
+            id: DeclarationId(2971),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88186,7 +89111,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2952),
+            id: DeclarationId(2972),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88200,17 +89125,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2953),
+            id: DeclarationId(2973),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2951),
+                        ty: DeclarationId(2971),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2952),
+                        ty: DeclarationId(2972),
                     },
                 ],
             },
@@ -88225,7 +89150,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2954),
+            id: DeclarationId(2974),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88244,7 +89169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2955),
+            id: DeclarationId(2975),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88258,17 +89183,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2956),
+            id: DeclarationId(2976),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2954),
+                        ty: DeclarationId(2974),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2955),
+                        ty: DeclarationId(2975),
                     },
                 ],
             },
@@ -88283,7 +89208,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2957),
+            id: DeclarationId(2977),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88302,7 +89227,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3781, 3785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2958),
+            id: DeclarationId(2978),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88316,17 +89241,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3781, 3785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2959),
+            id: DeclarationId(2979),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2957),
+                        ty: DeclarationId(2977),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2958),
+                        ty: DeclarationId(2978),
                     },
                 ],
             },
@@ -88341,7 +89266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3781, 3785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2960),
+            id: DeclarationId(2980),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88360,7 +89285,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(2981),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88374,17 +89299,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 4264, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2962),
+            id: DeclarationId(2982),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2960),
+                        ty: DeclarationId(2980),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2961),
+                        ty: DeclarationId(2981),
                     },
                 ],
             },
@@ -88399,7 +89324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 4264, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2963),
+            id: DeclarationId(2983),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88418,7 +89343,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 6172, 6179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2964),
+            id: DeclarationId(2984),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88432,17 +89357,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 6172, 6179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2965),
+            id: DeclarationId(2985),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2963),
+                        ty: DeclarationId(2983),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2964),
+                        ty: DeclarationId(2984),
                     },
                 ],
             },
@@ -88457,7 +89382,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 6172, 6179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2966),
+            id: DeclarationId(2986),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88476,7 +89401,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16964, 16984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2967),
+            id: DeclarationId(2987),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88490,17 +89415,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16964, 16984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2968),
+            id: DeclarationId(2988),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2966),
+                        ty: DeclarationId(2986),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2967),
+                        ty: DeclarationId(2987),
                     },
                 ],
             },
@@ -88515,7 +89440,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16964, 16984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2969),
+            id: DeclarationId(2989),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88534,7 +89459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17620, 17627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2970),
+            id: DeclarationId(2990),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88548,17 +89473,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17620, 17627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2971),
+            id: DeclarationId(2991),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2969),
+                        ty: DeclarationId(2989),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2970),
+                        ty: DeclarationId(2990),
                     },
                 ],
             },
@@ -88573,7 +89498,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17620, 17627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2972),
+            id: DeclarationId(2992),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88592,7 +89517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21380, 21390),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2973),
+            id: DeclarationId(2993),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88606,17 +89531,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21380, 21390),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2974),
+            id: DeclarationId(2994),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2972),
+                        ty: DeclarationId(2992),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2973),
+                        ty: DeclarationId(2993),
                     },
                 ],
             },
@@ -88631,7 +89556,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21380, 21390),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2975),
+            id: DeclarationId(2995),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88650,7 +89575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21515, 21522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2976),
+            id: DeclarationId(2996),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88664,17 +89589,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21515, 21522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2977),
+            id: DeclarationId(2997),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2975),
+                        ty: DeclarationId(2995),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2976),
+                        ty: DeclarationId(2996),
                     },
                 ],
             },
@@ -88689,7 +89614,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21515, 21522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2978),
+            id: DeclarationId(2998),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88708,7 +89633,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21589, 21593),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2979),
+            id: DeclarationId(2999),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88722,17 +89647,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21589, 21593),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2980),
+            id: DeclarationId(3000),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2978),
+                        ty: DeclarationId(2998),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2979),
+                        ty: DeclarationId(2999),
                     },
                 ],
             },
@@ -88747,7 +89672,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21589, 21593),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2981),
+            id: DeclarationId(3001),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88766,7 +89691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23360, 23367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2982),
+            id: DeclarationId(3002),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88780,17 +89705,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23360, 23367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2983),
+            id: DeclarationId(3003),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2981),
+                        ty: DeclarationId(3001),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2982),
+                        ty: DeclarationId(3002),
                     },
                 ],
             },
@@ -88805,7 +89730,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23360, 23367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2984),
+            id: DeclarationId(3004),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88824,7 +89749,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23872, 23879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2985),
+            id: DeclarationId(3005),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88838,17 +89763,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23872, 23879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2986),
+            id: DeclarationId(3006),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2984),
+                        ty: DeclarationId(3004),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2985),
+                        ty: DeclarationId(3005),
                     },
                 ],
             },
@@ -88863,7 +89788,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23872, 23879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2987),
+            id: DeclarationId(3007),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88882,7 +89807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23966, 23973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2988),
+            id: DeclarationId(3008),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88896,17 +89821,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23966, 23973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2989),
+            id: DeclarationId(3009),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2987),
+                        ty: DeclarationId(3007),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2988),
+                        ty: DeclarationId(3008),
                     },
                 ],
             },
@@ -88921,7 +89846,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23966, 23973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2990),
+            id: DeclarationId(3010),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88940,7 +89865,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24196, 24211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2991),
+            id: DeclarationId(3011),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88954,17 +89879,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24196, 24211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2992),
+            id: DeclarationId(3012),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2990),
+                        ty: DeclarationId(3010),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2991),
+                        ty: DeclarationId(3011),
                     },
                 ],
             },
@@ -88979,7 +89904,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24196, 24211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2993),
+            id: DeclarationId(3013),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88998,7 +89923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24222, 24235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2994),
+            id: DeclarationId(3014),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89012,17 +89937,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24222, 24235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2995),
+            id: DeclarationId(3015),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2993),
+                        ty: DeclarationId(3013),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2994),
+                        ty: DeclarationId(3014),
                     },
                 ],
             },
@@ -89037,7 +89962,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24222, 24235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2996),
+            id: DeclarationId(3016),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89056,7 +89981,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24251, 24264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2997),
+            id: DeclarationId(3017),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89070,17 +89995,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24251, 24264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2998),
+            id: DeclarationId(3018),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2996),
+                        ty: DeclarationId(3016),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2997),
+                        ty: DeclarationId(3017),
                     },
                 ],
             },
@@ -89095,7 +90020,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24251, 24264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2999),
+            id: DeclarationId(3019),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89114,7 +90039,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24374, 24381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3000),
+            id: DeclarationId(3020),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89128,17 +90053,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24374, 24381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3001),
+            id: DeclarationId(3021),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2999),
+                        ty: DeclarationId(3019),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3000),
+                        ty: DeclarationId(3020),
                     },
                 ],
             },
@@ -89153,7 +90078,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24374, 24381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3002),
+            id: DeclarationId(3022),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89172,7 +90097,7 @@ 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(3023),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89186,17 +90111,17 @@ 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(3024),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3002),
+                        ty: DeclarationId(3022),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3003),
+                        ty: DeclarationId(3023),
                     },
                 ],
             },
@@ -89211,12 +90136,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3005),
+            id: DeclarationId(3025),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1827),
+                    ty: DeclarationId(1841),
                 }],
             },
             type_params: vec![],
@@ -89230,7 +90155,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3006),
+            id: DeclarationId(3026),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89244,17 +90169,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3007),
+            id: DeclarationId(3027),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3005),
+                        ty: DeclarationId(3025),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3006),
+                        ty: DeclarationId(3026),
                     },
                 ],
             },
@@ -89269,12 +90194,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3008),
+            id: DeclarationId(3028),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1830),
+                    ty: DeclarationId(1844),
                 }],
             },
             type_params: vec![],
@@ -89288,7 +90213,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3009),
+            id: DeclarationId(3029),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89302,17 +90227,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3010),
+            id: DeclarationId(3030),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3008),
+                        ty: DeclarationId(3028),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3009),
+                        ty: DeclarationId(3029),
                     },
                 ],
             },
@@ -89327,7 +90252,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3011),
+            id: DeclarationId(3031),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89346,7 +90271,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3012),
+            id: DeclarationId(3032),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89360,17 +90285,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3013),
+            id: DeclarationId(3033),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3011),
+                        ty: DeclarationId(3031),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3012),
+                        ty: DeclarationId(3032),
                     },
                 ],
             },
@@ -89385,7 +90310,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3014),
+            id: DeclarationId(3034),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89404,7 +90329,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3015),
+            id: DeclarationId(3035),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89418,17 +90343,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3016),
+            id: DeclarationId(3036),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3014),
+                        ty: DeclarationId(3034),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3015),
+                        ty: DeclarationId(3035),
                     },
                 ],
             },
@@ -89443,7 +90368,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3017),
+            id: DeclarationId(3037),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89462,7 +90387,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3018),
+            id: DeclarationId(3038),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89476,17 +90401,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3019),
+            id: DeclarationId(3039),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3017),
+                        ty: DeclarationId(3037),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3018),
+                        ty: DeclarationId(3038),
                     },
                 ],
             },
@@ -89501,7 +90426,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3020),
+            id: DeclarationId(3040),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89520,7 +90445,7 @@ 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(3041),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89534,17 +90459,17 @@ 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(3042),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3020),
+                        ty: DeclarationId(3040),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3021),
+                        ty: DeclarationId(3041),
                     },
                 ],
             },
@@ -89559,7 +90484,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3023),
+            id: DeclarationId(3043),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89578,7 +90503,7 @@ 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(3044),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89592,17 +90517,17 @@ 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(3045),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3023),
+                        ty: DeclarationId(3043),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3024),
+                        ty: DeclarationId(3044),
                     },
                 ],
             },
@@ -89617,7 +90542,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3026),
+            id: DeclarationId(3046),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89636,7 +90561,7 @@ 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(3047),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89650,17 +90575,17 @@ 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(3048),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3026),
+                        ty: DeclarationId(3046),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3027),
+                        ty: DeclarationId(3047),
                     },
                 ],
             },
@@ -89675,7 +90600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3029),
+            id: DeclarationId(3049),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89694,7 +90619,7 @@ 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(3050),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89708,17 +90633,17 @@ 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(3051),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3029),
+                        ty: DeclarationId(3049),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3030),
+                        ty: DeclarationId(3050),
                     },
                 ],
             },
@@ -89733,7 +90658,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3032),
+            id: DeclarationId(3052),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89752,7 +90677,7 @@ 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(3053),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89766,17 +90691,17 @@ 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(3054),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3032),
+                        ty: DeclarationId(3052),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3033),
+                        ty: DeclarationId(3053),
                     },
                 ],
             },
@@ -89791,7 +90716,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3035),
+            id: DeclarationId(3055),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89810,7 +90735,7 @@ 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(3056),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89824,17 +90749,17 @@ 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(3057),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3035),
+                        ty: DeclarationId(3055),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3036),
+                        ty: DeclarationId(3056),
                     },
                 ],
             },
@@ -89849,7 +90774,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3038),
+            id: DeclarationId(3058),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89868,7 +90793,7 @@ 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(3059),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89882,17 +90807,17 @@ 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(3060),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3038),
+                        ty: DeclarationId(3058),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3039),
+                        ty: DeclarationId(3059),
                     },
                 ],
             },
@@ -89907,7 +90832,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3041),
+            id: DeclarationId(3061),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89926,7 +90851,7 @@ 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(3062),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89940,17 +90865,17 @@ 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(3063),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3041),
+                        ty: DeclarationId(3061),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3042),
+                        ty: DeclarationId(3062),
                     },
                 ],
             },
@@ -89965,7 +90890,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3044),
+            id: DeclarationId(3064),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89984,7 +90909,7 @@ 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(3065),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89998,17 +90923,17 @@ 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(3066),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3044),
+                        ty: DeclarationId(3064),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3045),
+                        ty: DeclarationId(3065),
                     },
                 ],
             },
@@ -90023,7 +90948,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3047),
+            id: DeclarationId(3067),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90042,7 +90967,7 @@ 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(3068),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90056,17 +90981,17 @@ 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(3069),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3047),
+                        ty: DeclarationId(3067),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3048),
+                        ty: DeclarationId(3068),
                     },
                 ],
             },
@@ -90081,7 +91006,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3050),
+            id: DeclarationId(3070),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90100,7 +91025,7 @@ 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(3071),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90114,17 +91039,17 @@ 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(3072),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3050),
+                        ty: DeclarationId(3070),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3051),
+                        ty: DeclarationId(3071),
                     },
                 ],
             },
@@ -90139,7 +91064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3053),
+            id: DeclarationId(3073),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90158,7 +91083,7 @@ 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(3074),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90172,17 +91097,17 @@ 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(3075),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3053),
+                        ty: DeclarationId(3073),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3054),
+                        ty: DeclarationId(3074),
                     },
                 ],
             },
@@ -90197,7 +91122,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3056),
+            id: DeclarationId(3076),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90216,7 +91141,7 @@ 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(3077),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90230,17 +91155,17 @@ 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(3078),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3056),
+                        ty: DeclarationId(3076),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3057),
+                        ty: DeclarationId(3077),
                     },
                 ],
             },
@@ -90255,7 +91180,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3059),
+            id: DeclarationId(3079),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90274,7 +91199,7 @@ 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(3080),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90288,17 +91213,17 @@ 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(3081),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3059),
+                        ty: DeclarationId(3079),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3060),
+                        ty: DeclarationId(3080),
                     },
                 ],
             },
@@ -90313,7 +91238,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3062),
+            id: DeclarationId(3082),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90332,7 +91257,7 @@ 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(3083),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90346,17 +91271,17 @@ 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(3084),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3062),
+                        ty: DeclarationId(3082),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3063),
+                        ty: DeclarationId(3083),
                     },
                 ],
             },
@@ -90371,7 +91296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3065),
+            id: DeclarationId(3085),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90390,7 +91315,7 @@ 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(3086),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90404,17 +91329,17 @@ 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(3087),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3065),
+                        ty: DeclarationId(3085),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3066),
+                        ty: DeclarationId(3086),
                     },
                 ],
             },
@@ -90429,7 +91354,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3068),
+            id: DeclarationId(3088),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90448,7 +91373,7 @@ 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(3089),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90462,17 +91387,17 @@ 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(3090),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3068),
+                        ty: DeclarationId(3088),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3069),
+                        ty: DeclarationId(3089),
                     },
                 ],
             },
@@ -90487,12 +91412,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3071),
+            id: DeclarationId(3091),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(842),
+                    ty: DeclarationId(846),
                 }],
             },
             type_params: vec![],
@@ -90503,10 +91428,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", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3072),
+            id: DeclarationId(3092),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90517,20 +91442,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", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3073),
+            id: DeclarationId(3093),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3071),
+                        ty: DeclarationId(3091),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3072),
+                        ty: DeclarationId(3092),
                     },
                 ],
             },
@@ -90542,15 +91467,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", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3074),
+            id: DeclarationId(3094),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(843),
+                    ty: DeclarationId(845),
                 }],
             },
             type_params: vec![],
@@ -90561,10 +91486,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", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3075),
+            id: DeclarationId(3095),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90575,20 +91500,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", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3076),
+            id: DeclarationId(3096),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3074),
+                        ty: DeclarationId(3094),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3075),
+                        ty: DeclarationId(3095),
                     },
                 ],
             },
@@ -90600,15 +91525,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", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3077),
+            id: DeclarationId(3097),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(93),
+                    ty: DeclarationId(847),
                 }],
             },
             type_params: vec![],
@@ -90619,10 +91544,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", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3078),
+            id: DeclarationId(3098),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90633,20 +91558,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", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3079),
+            id: DeclarationId(3099),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3077),
+                        ty: DeclarationId(3097),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3078),
+                        ty: DeclarationId(3098),
                     },
                 ],
             },
@@ -90658,15 +91583,15 @@ 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", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3080),
+            id: DeclarationId(3100),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(128),
                 }],
             },
             type_params: vec![],
@@ -90677,10 +91602,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", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3081),
+            id: DeclarationId(3101),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90691,20 +91616,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", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3082),
+            id: DeclarationId(3102),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3080),
+                        ty: DeclarationId(3100),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3081),
+                        ty: DeclarationId(3101),
                     },
                 ],
             },
@@ -90716,15 +91641,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", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3083),
+            id: DeclarationId(3103),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(115),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -90735,10 +91660,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", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3084),
+            id: DeclarationId(3104),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90749,20 +91674,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", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3085),
+            id: DeclarationId(3105),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3083),
+                        ty: DeclarationId(3103),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3084),
+                        ty: DeclarationId(3104),
                     },
                 ],
             },
@@ -90774,10 +91699,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", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3086),
+            id: DeclarationId(3106),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90793,10 +91718,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", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3087),
+            id: DeclarationId(3107),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90807,20 +91732,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", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3088),
+            id: DeclarationId(3108),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3086),
+                        ty: DeclarationId(3106),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3087),
+                        ty: DeclarationId(3107),
                     },
                 ],
             },
@@ -90832,15 +91757,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", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3089),
+            id: DeclarationId(3109),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(897),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -90851,10 +91776,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", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3090),
+            id: DeclarationId(3110),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90865,20 +91790,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", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3091),
+            id: DeclarationId(3111),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3089),
+                        ty: DeclarationId(3109),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3090),
+                        ty: DeclarationId(3110),
                     },
                 ],
             },
@@ -90890,15 +91815,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", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3092),
+            id: DeclarationId(3112),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(896),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -90909,10 +91834,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", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3093),
+            id: DeclarationId(3113),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90923,20 +91848,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", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3094),
+            id: DeclarationId(3114),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3092),
+                        ty: DeclarationId(3112),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3093),
+                        ty: DeclarationId(3113),
                     },
                 ],
             },
@@ -90948,15 +91873,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", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3095),
+            id: DeclarationId(3115),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(898),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -90967,10 +91892,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", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3096),
+            id: DeclarationId(3116),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90981,20 +91906,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", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3097),
+            id: DeclarationId(3117),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3095),
+                        ty: DeclarationId(3115),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3096),
+                        ty: DeclarationId(3116),
                     },
                 ],
             },
@@ -91006,15 +91931,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", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3098),
+            id: DeclarationId(3118),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(128),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -91025,10 +91950,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", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3099),
+            id: DeclarationId(3119),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91039,20 +91964,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", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3100),
+            id: DeclarationId(3120),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3098),
+                        ty: DeclarationId(3118),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3099),
+                        ty: DeclarationId(3119),
                     },
                 ],
             },
@@ -91064,10 +91989,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", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3101),
+            id: DeclarationId(3121),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91083,10 +92008,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", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3102),
+            id: DeclarationId(3122),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91097,20 +92022,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", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3103),
+            id: DeclarationId(3123),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3101),
+                        ty: DeclarationId(3121),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3102),
+                        ty: DeclarationId(3122),
                     },
                 ],
             },
@@ -91122,10 +92047,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", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3104),
+            id: DeclarationId(3124),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91141,10 +92066,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", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3105),
+            id: DeclarationId(3125),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91155,20 +92080,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", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3106),
+            id: DeclarationId(3126),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3104),
+                        ty: DeclarationId(3124),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3105),
+                        ty: DeclarationId(3125),
                     },
                 ],
             },
@@ -91180,15 +92105,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", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3107),
+            id: DeclarationId(3127),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(2072),
                 }],
             },
             type_params: vec![],
@@ -91199,10 +92124,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", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3108),
+            id: DeclarationId(3128),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91213,20 +92138,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", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3109),
+            id: DeclarationId(3129),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3107),
+                        ty: DeclarationId(3127),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3108),
+                        ty: DeclarationId(3128),
                     },
                 ],
             },
@@ -91238,15 +92163,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", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3110),
+            id: DeclarationId(3130),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(130),
                 }],
             },
             type_params: vec![],
@@ -91257,10 +92182,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", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3111),
+            id: DeclarationId(3131),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91271,20 +92196,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", 8601, 8608),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3112),
+            id: DeclarationId(3132),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3110),
+                        ty: DeclarationId(3130),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3111),
+                        ty: DeclarationId(3131),
                     },
                 ],
             },
@@ -91296,15 +92221,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", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3113),
+            id: DeclarationId(3133),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(130),
                 }],
             },
             type_params: vec![],
@@ -91315,10 +92240,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/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3114),
+            id: DeclarationId(3134),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91329,20 +92254,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/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3115),
+            id: DeclarationId(3135),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3113),
+                        ty: DeclarationId(3133),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3114),
+                        ty: DeclarationId(3134),
                     },
                 ],
             },
@@ -91354,15 +92279,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/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3116),
+            id: DeclarationId(3136),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(130),
                 }],
             },
             type_params: vec![],
@@ -91373,10 +92298,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/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3117),
+            id: DeclarationId(3137),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91387,20 +92312,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/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3118),
+            id: DeclarationId(3138),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3116),
+                        ty: DeclarationId(3136),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3117),
+                        ty: DeclarationId(3137),
                     },
                 ],
             },
@@ -91412,15 +92337,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/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3119),
+            id: DeclarationId(3139),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -91431,10 +92356,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/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3120),
+            id: DeclarationId(3140),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91445,20 +92370,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", 8897, 8904),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3121),
+            id: DeclarationId(3141),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3119),
+                        ty: DeclarationId(3139),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3120),
+                        ty: DeclarationId(3140),
                     },
                 ],
             },
@@ -91470,15 +92395,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/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3122),
+            id: DeclarationId(3142),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -91489,10 +92414,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/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3123),
+            id: DeclarationId(3143),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91503,20 +92428,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/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3124),
+            id: DeclarationId(3144),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3122),
+                        ty: DeclarationId(3142),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3123),
+                        ty: DeclarationId(3143),
                     },
                 ],
             },
@@ -91528,15 +92453,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/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3125),
+            id: DeclarationId(3145),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2145),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -91547,10 +92472,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/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3126),
+            id: DeclarationId(3146),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91561,20 +92486,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/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3127),
+            id: DeclarationId(3147),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3125),
+                        ty: DeclarationId(3145),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3126),
+                        ty: DeclarationId(3146),
                     },
                 ],
             },
@@ -91586,15 +92511,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/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3128),
+            id: DeclarationId(3148),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(130),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -91605,10 +92530,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/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3129),
+            id: DeclarationId(3149),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91619,20 +92544,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", 9933, 9938),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3130),
+            id: DeclarationId(3150),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3128),
+                        ty: DeclarationId(3148),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3129),
+                        ty: DeclarationId(3149),
                     },
                 ],
             },
@@ -91644,10 +92569,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/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3131),
+            id: DeclarationId(3151),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91663,10 +92588,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/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3132),
+            id: DeclarationId(3152),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91677,20 +92602,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/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3133),
+            id: DeclarationId(3153),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3131),
+                        ty: DeclarationId(3151),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3132),
+                        ty: DeclarationId(3152),
                     },
                 ],
             },
@@ -91702,15 +92627,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/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3134),
+            id: DeclarationId(3154),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(130),
+                    ty: DeclarationId(115),
                 }],
             },
             type_params: vec![],
@@ -91721,10 +92646,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/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3135),
+            id: DeclarationId(3155),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91735,20 +92660,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/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3136),
+            id: DeclarationId(3156),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3134),
+                        ty: DeclarationId(3154),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3135),
+                        ty: DeclarationId(3155),
                     },
                 ],
             },
@@ -91760,15 +92685,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", 10129, 10134),
+            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3137),
+            id: DeclarationId(3157),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(93),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -91779,10 +92704,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/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3138),
+            id: DeclarationId(3158),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91793,20 +92718,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/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3139),
+            id: DeclarationId(3159),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3137),
+                        ty: DeclarationId(3157),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3138),
+                        ty: DeclarationId(3158),
                     },
                 ],
             },
@@ -91818,15 +92743,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/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3140),
+            id: DeclarationId(3160),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(93),
+                    ty: DeclarationId(898),
                 }],
             },
             type_params: vec![],
@@ -91837,10 +92762,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/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3141),
+            id: DeclarationId(3161),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91851,20 +92776,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/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3142),
+            id: DeclarationId(3162),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3140),
+                        ty: DeclarationId(3160),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3141),
+                        ty: DeclarationId(3161),
                     },
                 ],
             },
@@ -91876,15 +92801,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/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3143),
+            id: DeclarationId(3163),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(899),
                 }],
             },
             type_params: vec![],
@@ -91895,10 +92820,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/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3144),
+            id: DeclarationId(3164),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91909,20 +92834,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/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3145),
+            id: DeclarationId(3165),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3143),
+                        ty: DeclarationId(3163),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3144),
+                        ty: DeclarationId(3164),
                     },
                 ],
             },
@@ -91934,15 +92859,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/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3146),
+            id: DeclarationId(3166),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -91953,10 +92878,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/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3147),
+            id: DeclarationId(3167),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91967,20 +92892,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/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3148),
+            id: DeclarationId(3168),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3146),
+                        ty: DeclarationId(3166),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3147),
+                        ty: DeclarationId(3167),
                     },
                 ],
             },
@@ -91992,15 +92917,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/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3149),
+            id: DeclarationId(3169),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(130),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -92011,10 +92936,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/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3150),
+            id: DeclarationId(3170),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92025,20 +92950,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/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3151),
+            id: DeclarationId(3171),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3149),
+                        ty: DeclarationId(3169),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3150),
+                        ty: DeclarationId(3170),
                     },
                 ],
             },
@@ -92050,15 +92975,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/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3152),
+            id: DeclarationId(3172),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(935),
+                    ty: DeclarationId(956),
                 }],
             },
             type_params: vec![],
@@ -92072,7 +92997,7 @@ 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(3173),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92086,17 +93011,17 @@ 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(3174),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3152),
+                        ty: DeclarationId(3172),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3153),
+                        ty: DeclarationId(3173),
                     },
                 ],
             },
@@ -92111,7 +93036,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3155),
+            id: DeclarationId(3175),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92130,7 +93055,7 @@ 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(3176),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92144,17 +93069,17 @@ 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(3177),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3155),
+                        ty: DeclarationId(3175),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3156),
+                        ty: DeclarationId(3176),
                     },
                 ],
             },
@@ -92169,7 +93094,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3158),
+            id: DeclarationId(3178),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92188,7 +93113,7 @@ 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(3179),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92202,17 +93127,17 @@ 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(3180),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3158),
+                        ty: DeclarationId(3178),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3159),
+                        ty: DeclarationId(3179),
                     },
                 ],
             },
@@ -92227,7 +93152,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3161),
+            id: DeclarationId(3181),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92246,7 +93171,7 @@ 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(3182),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92260,17 +93185,17 @@ 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(3183),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3161),
+                        ty: DeclarationId(3181),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3162),
+                        ty: DeclarationId(3182),
                     },
                 ],
             },
@@ -92285,12 +93210,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3164),
+            id: DeclarationId(3184),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(946),
+                    ty: DeclarationId(967),
                 }],
             },
             type_params: vec![],
@@ -92304,7 +93229,7 @@ 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(3185),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92318,17 +93243,17 @@ 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(3186),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3164),
+                        ty: DeclarationId(3184),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3165),
+                        ty: DeclarationId(3185),
                     },
                 ],
             },
@@ -92343,12 +93268,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3167),
+            id: DeclarationId(3187),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(946),
+                    ty: DeclarationId(967),
                 }],
             },
             type_params: vec![],
@@ -92362,7 +93287,7 @@ 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(3188),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92376,17 +93301,17 @@ 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(3189),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3167),
+                        ty: DeclarationId(3187),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3168),
+                        ty: DeclarationId(3188),
                     },
                 ],
             },
@@ -92401,12 +93326,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3170),
+            id: DeclarationId(3190),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(938),
+                    ty: DeclarationId(959),
                 }],
             },
             type_params: vec![],
@@ -92420,7 +93345,7 @@ 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(3191),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92434,17 +93359,17 @@ 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(3192),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3170),
+                        ty: DeclarationId(3190),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3171),
+                        ty: DeclarationId(3191),
                     },
                 ],
             },
@@ -92459,12 +93384,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3173),
+            id: DeclarationId(3193),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(935),
+                    ty: DeclarationId(1112),
                 }],
             },
             type_params: vec![],
@@ -92475,10 +93400,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3174),
+            id: DeclarationId(3194),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92489,20 +93414,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3175),
+            id: DeclarationId(3195),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3173),
+                        ty: DeclarationId(3193),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3174),
+                        ty: DeclarationId(3194),
                     },
                 ],
             },
@@ -92514,15 +93439,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3176),
+            id: DeclarationId(3196),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(940),
+                    ty: DeclarationId(1105),
                 }],
             },
             type_params: vec![],
@@ -92533,10 +93458,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9931, 9943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3177),
+            id: DeclarationId(3197),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92547,20 +93472,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9931, 9943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3178),
+            id: DeclarationId(3198),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3176),
+                        ty: DeclarationId(3196),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3177),
+                        ty: DeclarationId(3197),
                     },
                 ],
             },
@@ -92572,15 +93497,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9931, 9943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3179),
+            id: DeclarationId(3199),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(93),
+                    ty: DeclarationId(1112),
                 }],
             },
             type_params: vec![],
@@ -92591,10 +93516,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10408, 10420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3180),
+            id: DeclarationId(3200),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92605,20 +93530,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10408, 10420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3181),
+            id: DeclarationId(3201),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3179),
+                        ty: DeclarationId(3199),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3180),
+                        ty: DeclarationId(3200),
                     },
                 ],
             },
@@ -92630,15 +93555,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10408, 10420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3182),
+            id: DeclarationId(3202),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(93),
+                    ty: DeclarationId(1105),
                 }],
             },
             type_params: vec![],
@@ -92649,10 +93574,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10966, 10978),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3183),
+            id: DeclarationId(3203),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92663,20 +93588,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10966, 10978),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3184),
+            id: DeclarationId(3204),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3182),
+                        ty: DeclarationId(3202),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3183),
+                        ty: DeclarationId(3203),
                     },
                 ],
             },
@@ -92688,15 +93613,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10966, 10978),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3185),
+            id: DeclarationId(3205),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(93),
+                    ty: DeclarationId(1112),
                 }],
             },
             type_params: vec![],
@@ -92707,10 +93632,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 11146, 11158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3186),
+            id: DeclarationId(3206),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92721,20 +93646,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 11146, 11158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3187),
+            id: DeclarationId(3207),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3185),
+                        ty: DeclarationId(3205),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3186),
+                        ty: DeclarationId(3206),
                     },
                 ],
             },
@@ -92746,15 +93671,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 11146, 11158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3188),
+            id: DeclarationId(3208),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(93),
+                    ty: DeclarationId(1140),
                 }],
             },
             type_params: vec![],
@@ -92765,10 +93690,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3189),
+            id: DeclarationId(3209),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92779,20 +93704,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3190),
+            id: DeclarationId(3210),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3188),
+                        ty: DeclarationId(3208),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3189),
+                        ty: DeclarationId(3209),
                     },
                 ],
             },
@@ -92804,15 +93729,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3191),
+            id: DeclarationId(3211),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(93),
+                    ty: DeclarationId(1140),
                 }],
             },
             type_params: vec![],
@@ -92823,10 +93748,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3192),
+            id: DeclarationId(3212),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92837,20 +93762,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3193),
+            id: DeclarationId(3213),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3191),
+                        ty: DeclarationId(3211),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3192),
+                        ty: DeclarationId(3212),
                     },
                 ],
             },
@@ -92862,15 +93787,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3194),
+            id: DeclarationId(3214),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(93),
+                    ty: DeclarationId(1140),
                 }],
             },
             type_params: vec![],
@@ -92881,10 +93806,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3195),
+            id: DeclarationId(3215),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92895,20 +93820,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3196),
+            id: DeclarationId(3216),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3194),
+                        ty: DeclarationId(3214),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3195),
+                        ty: DeclarationId(3215),
                     },
                 ],
             },
@@ -92920,15 +93845,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3197),
+            id: DeclarationId(3217),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1161),
+                    ty: DeclarationId(1148),
                 }],
             },
             type_params: vec![],
@@ -92939,10 +93864,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
+            span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3198),
+            id: DeclarationId(3218),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92953,20 +93878,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
+            span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3199),
+            id: DeclarationId(3219),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3197),
+                        ty: DeclarationId(3217),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3198),
+                        ty: DeclarationId(3218),
                     },
                 ],
             },
@@ -92978,15 +93903,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
+            span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3200),
+            id: DeclarationId(3220),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1154),
+                    ty: DeclarationId(1150),
                 }],
             },
             type_params: vec![],
@@ -92997,10 +93922,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9931, 9943),
+            span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3201),
+            id: DeclarationId(3221),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93011,20 +93936,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9931, 9943),
+            span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3202),
+            id: DeclarationId(3222),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3200),
+                        ty: DeclarationId(3220),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3201),
+                        ty: DeclarationId(3221),
                     },
                 ],
             },
@@ -93036,15 +93961,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9931, 9943),
+            span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3203),
+            id: DeclarationId(3223),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1161),
+                    ty: DeclarationId(956),
                 }],
             },
             type_params: vec![],
@@ -93055,10 +93980,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10408, 10420),
+            span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3204),
+            id: DeclarationId(3224),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93069,20 +93994,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10408, 10420),
+            span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3205),
+            id: DeclarationId(3225),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3203),
+                        ty: DeclarationId(3223),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3204),
+                        ty: DeclarationId(3224),
                     },
                 ],
             },
@@ -93094,15 +94019,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10408, 10420),
+            span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3206),
+            id: DeclarationId(3226),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1154),
+                    ty: DeclarationId(961),
                 }],
             },
             type_params: vec![],
@@ -93113,10 +94038,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10966, 10978),
+            span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3207),
+            id: DeclarationId(3227),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93127,20 +94052,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10966, 10978),
+            span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3208),
+            id: DeclarationId(3228),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3206),
+                        ty: DeclarationId(3226),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3207),
+                        ty: DeclarationId(3227),
                     },
                 ],
             },
@@ -93152,15 +94077,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10966, 10978),
+            span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3209),
+            id: DeclarationId(3229),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1161),
+                    ty: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -93171,10 +94096,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 11146, 11158),
+            span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3210),
+            id: DeclarationId(3230),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93185,20 +94110,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 11146, 11158),
+            span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3211),
+            id: DeclarationId(3231),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3209),
+                        ty: DeclarationId(3229),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3210),
+                        ty: DeclarationId(3230),
                     },
                 ],
             },
@@ -93210,15 +94135,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 11146, 11158),
+            span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3212),
+            id: DeclarationId(3232),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1213),
+                    ty: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -93229,10 +94154,10 @@ 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/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3213),
+            id: DeclarationId(3233),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93243,20 +94168,20 @@ 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/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3214),
+            id: DeclarationId(3234),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3212),
+                        ty: DeclarationId(3232),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3213),
+                        ty: DeclarationId(3233),
                     },
                 ],
             },
@@ -93268,15 +94193,15 @@ 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/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3215),
+            id: DeclarationId(3235),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1213),
+                    ty: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -93287,10 +94212,10 @@ 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/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3216),
+            id: DeclarationId(3236),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93301,20 +94226,20 @@ 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/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3217),
+            id: DeclarationId(3237),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3215),
+                        ty: DeclarationId(3235),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3216),
+                        ty: DeclarationId(3236),
                     },
                 ],
             },
@@ -93326,15 +94251,15 @@ 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/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3218),
+            id: DeclarationId(3238),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1213),
+                    ty: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -93345,10 +94270,10 @@ 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/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3219),
+            id: DeclarationId(3239),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93359,20 +94284,20 @@ 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/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3220),
+            id: DeclarationId(3240),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3218),
+                        ty: DeclarationId(3238),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3219),
+                        ty: DeclarationId(3239),
                     },
                 ],
             },
@@ -93384,15 +94309,15 @@ 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/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3221),
+            id: DeclarationId(3241),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1221),
+                    ty: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -93403,10 +94328,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
+            span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3222),
+            id: DeclarationId(3242),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93417,20 +94342,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
+            span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3223),
+            id: DeclarationId(3243),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3221),
+                        ty: DeclarationId(3241),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3222),
+                        ty: DeclarationId(3242),
                     },
                 ],
             },
@@ -93442,15 +94367,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
+            span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3224),
+            id: DeclarationId(3244),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1223),
+                    ty: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -93461,10 +94386,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
+            span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3225),
+            id: DeclarationId(3245),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93475,20 +94400,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
+            span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3226),
+            id: DeclarationId(3246),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3224),
+                        ty: DeclarationId(3244),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3225),
+                        ty: DeclarationId(3245),
                     },
                 ],
             },
@@ -93500,10 +94425,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
+            span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3227),
+            id: DeclarationId(3247),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93522,7 +94447,7 @@ 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(3248),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93536,17 +94461,17 @@ 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(3249),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3227),
+                        ty: DeclarationId(3247),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3228),
+                        ty: DeclarationId(3248),
                     },
                 ],
             },
@@ -93561,7 +94486,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3230),
+            id: DeclarationId(3250),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93580,7 +94505,7 @@ 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(3251),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93594,17 +94519,17 @@ 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(3252),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3230),
+                        ty: DeclarationId(3250),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3231),
+                        ty: DeclarationId(3251),
                     },
                 ],
             },
@@ -93619,7 +94544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3233),
+            id: DeclarationId(3253),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93638,7 +94563,7 @@ 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(3254),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93652,17 +94577,17 @@ 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(3255),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3233),
+                        ty: DeclarationId(3253),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3234),
+                        ty: DeclarationId(3254),
                     },
                 ],
             },
@@ -93677,12 +94602,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3236),
+            id: DeclarationId(3256),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1757),
+                    ty: DeclarationId(1771),
                 }],
             },
             type_params: vec![],
@@ -93696,7 +94621,7 @@ 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(3257),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93710,17 +94635,17 @@ 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(3258),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3236),
+                        ty: DeclarationId(3256),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3237),
+                        ty: DeclarationId(3257),
                     },
                 ],
             },
@@ -93735,12 +94660,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3239),
+            id: DeclarationId(3259),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2812),
+                    ty: DeclarationId(2832),
                 }],
             },
             type_params: vec![],
@@ -93754,7 +94679,7 @@ 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(3260),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93768,17 +94693,17 @@ 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(3261),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3239),
+                        ty: DeclarationId(3259),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3240),
+                        ty: DeclarationId(3260),
                     },
                 ],
             },
@@ -93793,12 +94718,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3242),
+            id: DeclarationId(3262),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1746),
+                    ty: DeclarationId(1760),
                 }],
             },
             type_params: vec![],
@@ -93812,7 +94737,7 @@ 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(3263),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93826,17 +94751,17 @@ 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(3264),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3242),
+                        ty: DeclarationId(3262),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3243),
+                        ty: DeclarationId(3263),
                     },
                 ],
             },
@@ -93851,7 +94776,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3245),
+            id: DeclarationId(3265),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93870,7 +94795,7 @@ 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(3266),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93884,17 +94809,17 @@ 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(3267),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3245),
+                        ty: DeclarationId(3265),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3246),
+                        ty: DeclarationId(3266),
                     },
                 ],
             },
@@ -93909,7 +94834,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3248),
+            id: DeclarationId(3268),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93928,7 +94853,7 @@ 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(3269),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93942,17 +94867,17 @@ 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(3270),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3248),
+                        ty: DeclarationId(3268),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3249),
+                        ty: DeclarationId(3269),
                     },
                 ],
             },
@@ -93967,7 +94892,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3251),
+            id: DeclarationId(3271),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93986,7 +94911,7 @@ 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(3272),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94000,17 +94925,17 @@ 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(3273),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3251),
+                        ty: DeclarationId(3271),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3252),
+                        ty: DeclarationId(3272),
                     },
                 ],
             },
@@ -94025,12 +94950,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3254),
+            id: DeclarationId(3274),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2846),
+                    ty: DeclarationId(2866),
                 }],
             },
             type_params: vec![],
@@ -94044,7 +94969,7 @@ 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(3275),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94058,17 +94983,17 @@ 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(3276),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3254),
+                        ty: DeclarationId(3274),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3255),
+                        ty: DeclarationId(3275),
                     },
                 ],
             },
@@ -94083,12 +95008,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3257),
+            id: DeclarationId(3277),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2848),
+                    ty: DeclarationId(2868),
                 }],
             },
             type_params: vec![],
@@ -94102,7 +95027,7 @@ 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(3278),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94116,17 +95041,17 @@ 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(3279),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3257),
+                        ty: DeclarationId(3277),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3258),
+                        ty: DeclarationId(3278),
                     },
                 ],
             },
@@ -94141,7 +95066,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3260),
+            id: DeclarationId(3280),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94160,7 +95085,7 @@ 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(3281),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94174,17 +95099,17 @@ 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(3282),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3260),
+                        ty: DeclarationId(3280),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3261),
+                        ty: DeclarationId(3281),
                     },
                 ],
             },
@@ -94199,12 +95124,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3263),
+            id: DeclarationId(3283),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1776),
+                    ty: DeclarationId(1790),
                 }],
             },
             type_params: vec![],
@@ -94218,7 +95143,7 @@ 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(3284),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94232,17 +95157,17 @@ 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(3285),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3263),
+                        ty: DeclarationId(3283),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3264),
+                        ty: DeclarationId(3284),
                     },
                 ],
             },
@@ -94257,7 +95182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3266),
+            id: DeclarationId(3286),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94276,7 +95201,7 @@ 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(3287),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94290,17 +95215,17 @@ 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(3288),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3266),
+                        ty: DeclarationId(3286),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3267),
+                        ty: DeclarationId(3287),
                     },
                 ],
             },
@@ -94315,12 +95240,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3269),
+            id: DeclarationId(3289),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1757),
+                    ty: DeclarationId(1771),
                 }],
             },
             type_params: vec![],
@@ -94334,7 +95259,7 @@ 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(3290),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94348,17 +95273,17 @@ 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(3291),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3269),
+                        ty: DeclarationId(3289),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3270),
+                        ty: DeclarationId(3290),
                     },
                 ],
             },
@@ -94373,12 +95298,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3272),
+            id: DeclarationId(3292),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1756),
+                    ty: DeclarationId(1770),
                 }],
             },
             type_params: vec![],
@@ -94392,7 +95317,7 @@ 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(3293),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94406,17 +95331,17 @@ 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(3294),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3272),
+                        ty: DeclarationId(3292),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3273),
+                        ty: DeclarationId(3293),
                     },
                 ],
             },
@@ -94431,12 +95356,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3275),
+            id: DeclarationId(3295),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1755),
+                    ty: DeclarationId(1769),
                 }],
             },
             type_params: vec![],
@@ -94450,7 +95375,7 @@ 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(3296),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94464,17 +95389,17 @@ 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(3297),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3275),
+                        ty: DeclarationId(3295),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3276),
+                        ty: DeclarationId(3296),
                     },
                 ],
             },
@@ -94489,7 +95414,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3278),
+            id: DeclarationId(3298),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94508,7 +95433,7 @@ 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(3299),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94522,17 +95447,17 @@ 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(3300),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3278),
+                        ty: DeclarationId(3298),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3279),
+                        ty: DeclarationId(3299),
                     },
                 ],
             },
@@ -94547,7 +95472,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3281),
+            id: DeclarationId(3301),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94566,7 +95491,7 @@ 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(3302),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94580,17 +95505,17 @@ 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(3303),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3281),
+                        ty: DeclarationId(3301),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3282),
+                        ty: DeclarationId(3302),
                     },
                 ],
             },
@@ -94605,7 +95530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3284),
+            id: DeclarationId(3304),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94624,7 +95549,7 @@ 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(3305),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94638,17 +95563,17 @@ 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(3306),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3284),
+                        ty: DeclarationId(3304),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3285),
+                        ty: DeclarationId(3305),
                     },
                 ],
             },
@@ -94663,12 +95588,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3287),
+            id: DeclarationId(3307),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2876),
+                    ty: DeclarationId(2896),
                 }],
             },
             type_params: vec![],
@@ -94682,7 +95607,7 @@ 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(3308),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94696,17 +95621,17 @@ 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(3309),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3287),
+                        ty: DeclarationId(3307),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3288),
+                        ty: DeclarationId(3308),
                     },
                 ],
             },
@@ -94721,7 +95646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3290),
+            id: DeclarationId(3310),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94740,7 +95665,7 @@ 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(3311),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94754,17 +95679,17 @@ 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(3312),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3290),
+                        ty: DeclarationId(3310),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3291),
+                        ty: DeclarationId(3311),
                     },
                 ],
             },
@@ -94779,7 +95704,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3293),
+            id: DeclarationId(3313),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94798,7 +95723,7 @@ 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(3314),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94812,17 +95737,17 @@ 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(3315),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3293),
+                        ty: DeclarationId(3313),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3294),
+                        ty: DeclarationId(3314),
                     },
                 ],
             },
@@ -94837,7 +95762,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3296),
+            id: DeclarationId(3316),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94856,7 +95781,7 @@ 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(3317),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94870,17 +95795,17 @@ 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(3318),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3296),
+                        ty: DeclarationId(3316),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3297),
+                        ty: DeclarationId(3317),
                     },
                 ],
             },
@@ -94895,7 +95820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3299),
+            id: DeclarationId(3319),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94914,7 +95839,7 @@ 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(3320),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94928,17 +95853,17 @@ 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(3321),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3299),
+                        ty: DeclarationId(3319),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3300),
+                        ty: DeclarationId(3320),
                     },
                 ],
             },
@@ -94953,7 +95878,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3302),
+            id: DeclarationId(3322),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94972,7 +95897,7 @@ 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(3323),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94986,17 +95911,17 @@ 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(3324),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3302),
+                        ty: DeclarationId(3322),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3303),
+                        ty: DeclarationId(3323),
                     },
                 ],
             },
@@ -95011,12 +95936,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3305),
+            id: DeclarationId(3325),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2884),
+                    ty: DeclarationId(2904),
                 }],
             },
             type_params: vec![],
@@ -95030,7 +95955,7 @@ 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(3326),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95044,17 +95969,17 @@ 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(3327),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3305),
+                        ty: DeclarationId(3325),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3306),
+                        ty: DeclarationId(3326),
                     },
                 ],
             },
@@ -95069,12 +95994,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3308),
+            id: DeclarationId(3328),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2886),
+                    ty: DeclarationId(2906),
                 }],
             },
             type_params: vec![],
@@ -95088,7 +96013,7 @@ 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(3329),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95102,17 +96027,17 @@ 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(3330),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3308),
+                        ty: DeclarationId(3328),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3309),
+                        ty: DeclarationId(3329),
                     },
                 ],
             },
@@ -95127,7 +96052,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3311),
+            id: DeclarationId(3331),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95146,7 +96071,7 @@ 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(3332),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95160,17 +96085,17 @@ 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(3333),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3311),
+                        ty: DeclarationId(3331),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3312),
+                        ty: DeclarationId(3332),
                     },
                 ],
             },
@@ -95185,7 +96110,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3314),
+            id: DeclarationId(3334),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95204,7 +96129,7 @@ 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(3335),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95218,17 +96143,17 @@ 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(3336),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3314),
+                        ty: DeclarationId(3334),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3315),
+                        ty: DeclarationId(3335),
                     },
                 ],
             },
@@ -95243,7 +96168,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3317),
+            id: DeclarationId(3337),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95262,7 +96187,7 @@ 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(3338),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95276,17 +96201,17 @@ 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(3339),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3317),
+                        ty: DeclarationId(3337),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3318),
+                        ty: DeclarationId(3338),
                     },
                 ],
             },
@@ -95301,7 +96226,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3320),
+            id: DeclarationId(3340),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95320,7 +96245,7 @@ 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(3341),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95334,17 +96259,17 @@ 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(3342),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3320),
+                        ty: DeclarationId(3340),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3321),
+                        ty: DeclarationId(3341),
                     },
                 ],
             },
@@ -95359,7 +96284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3323),
+            id: DeclarationId(3343),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95378,7 +96303,7 @@ 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(3344),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95392,17 +96317,17 @@ 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(3345),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3323),
+                        ty: DeclarationId(3343),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3324),
+                        ty: DeclarationId(3344),
                     },
                 ],
             },
@@ -95417,7 +96342,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3326),
+            id: DeclarationId(3346),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95436,7 +96361,7 @@ 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(3347),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95450,17 +96375,17 @@ 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(3348),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3326),
+                        ty: DeclarationId(3346),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3327),
+                        ty: DeclarationId(3347),
                     },
                 ],
             },
@@ -95475,7 +96400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3329),
+            id: DeclarationId(3349),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95494,7 +96419,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(3350),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95508,17 +96433,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(3351),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3329),
+                        ty: DeclarationId(3349),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3330),
+                        ty: DeclarationId(3350),
                     },
                 ],
             },
@@ -95533,7 +96458,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(3352),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95552,7 +96477,7 @@ 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(3353),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95566,17 +96491,17 @@ 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(3354),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3332),
+                        ty: DeclarationId(3352),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3333),
+                        ty: DeclarationId(3353),
                     },
                 ],
             },
@@ -95591,7 +96516,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3335),
+            id: DeclarationId(3355),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95610,7 +96535,7 @@ 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(3356),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95624,17 +96549,17 @@ 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(3357),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3335),
+                        ty: DeclarationId(3355),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3336),
+                        ty: DeclarationId(3356),
                     },
                 ],
             },
@@ -95649,7 +96574,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3338),
+            id: DeclarationId(3358),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95668,7 +96593,7 @@ 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(3359),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95682,17 +96607,17 @@ 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(3360),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3338),
+                        ty: DeclarationId(3358),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3339),
+                        ty: DeclarationId(3359),
                     },
                 ],
             },
@@ -95707,7 +96632,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3341),
+            id: DeclarationId(3361),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95726,7 +96651,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(3362),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95740,17 +96665,17 @@ 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(3363),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3341),
+                        ty: DeclarationId(3361),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3342),
+                        ty: DeclarationId(3362),
                     },
                 ],
             },
@@ -95765,7 +96690,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11689, 11693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3344),
+            id: DeclarationId(3364),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95784,7 +96709,7 @@ 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(3365),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95798,17 +96723,17 @@ 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(3366),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3344),
+                        ty: DeclarationId(3364),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3345),
+                        ty: DeclarationId(3365),
                     },
                 ],
             },
@@ -95823,7 +96748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12673, 12677),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3347),
+            id: DeclarationId(3367),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95842,7 +96767,7 @@ 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(3368),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95856,17 +96781,17 @@ 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(3369),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3347),
+                        ty: DeclarationId(3367),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3348),
+                        ty: DeclarationId(3368),
                     },
                 ],
             },
@@ -95881,7 +96806,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3350),
+            id: DeclarationId(3370),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95900,7 +96825,7 @@ 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(3371),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95914,17 +96839,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13403, 13407),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3352),
+            id: DeclarationId(3372),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3350),
+                        ty: DeclarationId(3370),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3351),
+                        ty: DeclarationId(3371),
                     },
                 ],
             },
@@ -97365,7 +98290,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(177),
             Port {
                 id: PortId(177),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(845))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(901))),
                 produced_by: None,
             },
         );
@@ -97373,7 +98298,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(178),
             Port {
                 id: PortId(178),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(845))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(901))),
                 produced_by: None,
             },
         );
@@ -97405,7 +98330,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(182),
             Port {
                 id: PortId(182),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -97421,7 +98346,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(184),
             Port {
                 id: PortId(184),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(850))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(906))),
                 produced_by: Some(NodeId(180)),
             },
         );
@@ -97429,7 +98354,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(185),
             Port {
                 id: PortId(185),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -97437,7 +98362,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(186),
             Port {
                 id: PortId(186),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -97461,7 +98386,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(189),
             Port {
                 id: PortId(189),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2013))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2139))),
                 produced_by: Some(NodeId(184)),
             },
         );
@@ -97469,7 +98394,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(190),
             Port {
                 id: PortId(190),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -97477,7 +98402,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(191),
             Port {
                 id: PortId(191),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -97485,7 +98410,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(192),
             Port {
                 id: PortId(192),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2014))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2140))),
                 produced_by: None,
             },
         );
@@ -97493,7 +98418,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(193),
             Port {
                 id: PortId(193),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2015))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2141))),
                 produced_by: Some(NodeId(186)),
             },
         );
@@ -97501,7 +98426,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(194),
             Port {
                 id: PortId(194),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -97549,7 +98474,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(200),
             Port {
                 id: PortId(200),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(848))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(904))),
                 produced_by: None,
             },
         );
@@ -97621,7 +98546,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(209),
             Port {
                 id: PortId(209),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -97629,7 +98554,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(210),
             Port {
                 id: PortId(210),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -97653,7 +98578,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(213),
             Port {
                 id: PortId(213),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(203)),
             },
         );
@@ -97661,7 +98586,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(214),
             Port {
                 id: PortId(214),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -97669,7 +98594,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(215),
             Port {
                 id: PortId(215),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -97693,7 +98618,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(218),
             Port {
                 id: PortId(218),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(207)),
             },
         );
@@ -97701,7 +98626,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(219),
             Port {
                 id: PortId(219),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -97709,7 +98634,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(220),
             Port {
                 id: PortId(220),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -97733,7 +98658,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(223),
             Port {
                 id: PortId(223),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(211)),
             },
         );
@@ -97741,7 +98666,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(224),
             Port {
                 id: PortId(224),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -97749,7 +98674,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(225),
             Port {
                 id: PortId(225),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -97773,7 +98698,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(228),
             Port {
                 id: PortId(228),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(215)),
             },
         );
@@ -97781,7 +98706,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(229),
             Port {
                 id: PortId(229),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2016))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2142))),
                 produced_by: None,
             },
         );
@@ -97805,7 +98730,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(232),
             Port {
                 id: PortId(232),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(219)),
             },
         );
@@ -97813,7 +98738,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(233),
             Port {
                 id: PortId(233),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -97821,7 +98746,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(234),
             Port {
                 id: PortId(234),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -98525,7 +99450,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(322),
             Port {
                 id: PortId(322),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(845))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(901))),
                 produced_by: None,
             },
         );
@@ -98533,7 +99458,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(323),
             Port {
                 id: PortId(323),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(845))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(901))),
                 produced_by: None,
             },
         );
@@ -98549,7 +99474,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(325),
             Port {
                 id: PortId(325),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(865))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(921))),
                 produced_by: None,
             },
         );
@@ -98557,7 +99482,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(326),
             Port {
                 id: PortId(326),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(865))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(921))),
                 produced_by: None,
             },
         );
@@ -99181,7 +100106,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(404),
             Port {
                 id: PortId(404),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(865))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(921))),
                 produced_by: None,
             },
         );
@@ -99189,7 +100114,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(405),
             Port {
                 id: PortId(405),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(865))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(921))),
                 produced_by: None,
             },
         );
@@ -99205,7 +100130,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(407),
             Port {
                 id: PortId(407),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(865))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(921))),
                 produced_by: Some(NodeId(347)),
             },
         );
@@ -99213,7 +100138,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(408),
             Port {
                 id: PortId(408),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(865))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(921))),
                 produced_by: None,
             },
         );
@@ -99221,7 +100146,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(409),
             Port {
                 id: PortId(409),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(865))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(921))),
                 produced_by: None,
             },
         );
@@ -99237,7 +100162,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(411),
             Port {
                 id: PortId(411),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(865))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(921))),
                 produced_by: Some(NodeId(350)),
             },
         );
@@ -99245,7 +100170,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(412),
             Port {
                 id: PortId(412),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -99325,7 +100250,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(422),
             Port {
                 id: PortId(422),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(359)),
             },
         );
@@ -99333,7 +100258,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(423),
             Port {
                 id: PortId(423),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2017))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2143))),
                 produced_by: None,
             },
         );
@@ -99341,7 +100266,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(424),
             Port {
                 id: PortId(424),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(361)),
             },
         );
@@ -99349,7 +100274,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(425),
             Port {
                 id: PortId(425),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(362)),
             },
         );
@@ -99357,7 +100282,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(426),
             Port {
                 id: PortId(426),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2014))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2140))),
                 produced_by: Some(NodeId(363)),
             },
         );
@@ -99373,7 +100298,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(428),
             Port {
                 id: PortId(428),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2018))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2144))),
                 produced_by: Some(NodeId(365)),
             },
         );
@@ -99381,7 +100306,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(429),
             Port {
                 id: PortId(429),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2019))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2145))),
                 produced_by: None,
             },
         );
@@ -99485,7 +100410,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(442),
             Port {
                 id: PortId(442),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2020))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2146))),
                 produced_by: Some(NodeId(378)),
             },
         );
@@ -99493,7 +100418,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(443),
             Port {
                 id: PortId(443),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2021))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2147))),
                 produced_by: None,
             },
         );
@@ -99541,7 +100466,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(449),
             Port {
                 id: PortId(449),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2022))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2148))),
                 produced_by: Some(NodeId(385)),
             },
         );
@@ -99549,7 +100474,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(450),
             Port {
                 id: PortId(450),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2023))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2149))),
                 produced_by: None,
             },
         );
@@ -99629,7 +100554,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(460),
             Port {
                 id: PortId(460),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2024))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2150))),
                 produced_by: None,
             },
         );
@@ -99733,7 +100658,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(473),
             Port {
                 id: PortId(473),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2025))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2151))),
                 produced_by: Some(NodeId(407)),
             },
         );
@@ -99741,7 +100666,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(474),
             Port {
                 id: PortId(474),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -99877,7 +100802,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(491),
             Port {
                 id: PortId(491),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -100013,7 +100938,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(508),
             Port {
                 id: PortId(508),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2026))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2152))),
                 produced_by: None,
             },
         );
@@ -100117,7 +101042,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(521),
             Port {
                 id: PortId(521),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(439)),
             },
         );
@@ -100125,7 +101050,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(522),
             Port {
                 id: PortId(522),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2027))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2153))),
                 produced_by: None,
             },
         );
@@ -100229,7 +101154,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(535),
             Port {
                 id: PortId(535),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(451)),
             },
         );
@@ -100237,7 +101162,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(536),
             Port {
                 id: PortId(536),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2028))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2154))),
                 produced_by: None,
             },
         );
@@ -100389,7 +101314,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(555),
             Port {
                 id: PortId(555),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(468)),
             },
         );
@@ -100397,7 +101322,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(556),
             Port {
                 id: PortId(556),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -100405,7 +101330,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(557),
             Port {
                 id: PortId(557),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -100525,7 +101450,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(572),
             Port {
                 id: PortId(572),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(477)),
             },
         );
@@ -100533,7 +101458,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(573),
             Port {
                 id: PortId(573),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(845))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(901))),
                 produced_by: None,
             },
         );
@@ -100541,7 +101466,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(574),
             Port {
                 id: PortId(574),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -100549,7 +101474,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(575),
             Port {
                 id: PortId(575),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -100669,7 +101594,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(590),
             Port {
                 id: PortId(590),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(486)),
             },
         );
@@ -100677,7 +101602,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(591),
             Port {
                 id: PortId(591),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(845))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(901))),
                 produced_by: None,
             },
         );
@@ -100685,7 +101610,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(592),
             Port {
                 id: PortId(592),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(845))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(901))),
                 produced_by: None,
             },
         );
@@ -100693,7 +101618,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(593),
             Port {
                 id: PortId(593),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -100701,7 +101626,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(594),
             Port {
                 id: PortId(594),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -100733,7 +101658,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(598),
             Port {
                 id: PortId(598),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(491)),
             },
         );
@@ -100741,7 +101666,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(599),
             Port {
                 id: PortId(599),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -100749,7 +101674,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(600),
             Port {
                 id: PortId(600),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -100765,7 +101690,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(602),
             Port {
                 id: PortId(602),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(494)),
             },
         );
@@ -100773,7 +101698,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(603),
             Port {
                 id: PortId(603),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(850))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(906))),
                 produced_by: None,
             },
         );
@@ -100781,7 +101706,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(604),
             Port {
                 id: PortId(604),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -100797,7 +101722,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(606),
             Port {
                 id: PortId(606),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(497)),
             },
         );
@@ -100821,7 +101746,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(609),
             Port {
                 id: PortId(609),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(500)),
             },
         );
@@ -100829,7 +101754,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(610),
             Port {
                 id: PortId(610),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(850))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(906))),
                 produced_by: Some(NodeId(501)),
             },
         );
@@ -100837,7 +101762,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(611),
             Port {
                 id: PortId(611),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(850))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(906))),
                 produced_by: None,
             },
         );
@@ -100853,7 +101778,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(613),
             Port {
                 id: PortId(613),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2029))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2155))),
                 produced_by: None,
             },
         );
@@ -100861,7 +101786,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(614),
             Port {
                 id: PortId(614),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -100965,7 +101890,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(627),
             Port {
                 id: PortId(627),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2030))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2156))),
                 produced_by: Some(NodeId(516)),
             },
         );
@@ -100973,7 +101898,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(628),
             Port {
                 id: PortId(628),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2031))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2157))),
                 produced_by: None,
             },
         );
@@ -100981,7 +101906,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(629),
             Port {
                 id: PortId(629),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -101029,7 +101954,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(635),
             Port {
                 id: PortId(635),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2032))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2158))),
                 produced_by: Some(NodeId(523)),
             },
         );
@@ -101037,7 +101962,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(636),
             Port {
                 id: PortId(636),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2033))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2159))),
                 produced_by: None,
             },
         );
@@ -101053,7 +101978,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(638),
             Port {
                 id: PortId(638),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2034))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2160))),
                 produced_by: Some(NodeId(526)),
             },
         );
@@ -101061,7 +101986,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(639),
             Port {
                 id: PortId(639),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1085))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1180))),
                 produced_by: None,
             },
         );
@@ -101221,7 +102146,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(659),
             Port {
                 id: PortId(659),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(543)),
             },
         );
@@ -101229,7 +102154,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(660),
             Port {
                 id: PortId(660),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1084))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1179))),
                 produced_by: None,
             },
         );
@@ -101309,7 +102234,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(670),
             Port {
                 id: PortId(670),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(552)),
             },
         );
@@ -101317,7 +102242,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(671),
             Port {
                 id: PortId(671),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2367))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2526))),
                 produced_by: None,
             },
         );
@@ -101325,7 +102250,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(672),
             Port {
                 id: PortId(672),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(554)),
             },
         );
@@ -101341,55 +102266,55 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(674),
             Port {
                 id: PortId(674),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(827))),
-                produced_by: None,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2648))),
+                produced_by: Some(NodeId(556)),
             },
         );
         ports.insert(
             PortId(675),
             Port {
                 id: PortId(675),
-                state: PortState::Uninferred,
-                produced_by: None,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(158))),
+                produced_by: Some(NodeId(558)),
             },
         );
         ports.insert(
             PortId(676),
             Port {
                 id: PortId(676),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(556)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(721))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(677),
             Port {
                 id: PortId(677),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(557)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(173))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(678),
             Port {
                 id: PortId(678),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(558)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(174))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(679),
             Port {
                 id: PortId(679),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(559)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(177))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(680),
             Port {
                 id: PortId(680),
-                state: PortState::Uninferred,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1229))),
                 produced_by: None,
             },
         );
@@ -101397,7 +102322,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(681),
             Port {
                 id: PortId(681),
-                state: PortState::Uninferred,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1232))),
                 produced_by: Some(NodeId(560)),
             },
         );
@@ -101405,31 +102330,31 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(682),
             Port {
                 id: PortId(682),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(561)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1230))),
+                produced_by: Some(NodeId(562)),
             },
         );
         ports.insert(
             PortId(683),
             Port {
                 id: PortId(683),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(562)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1230))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(684),
             Port {
                 id: PortId(684),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(563)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1230))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(685),
             Port {
                 id: PortId(685),
-                state: PortState::Uninferred,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
                 produced_by: None,
             },
         );
@@ -101510,7 +102435,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(695),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(572)),
             },
         );
         ports.insert(
@@ -101518,7 +102443,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(696),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(572)),
+                produced_by: Some(NodeId(573)),
             },
         );
         ports.insert(
@@ -101526,7 +102451,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(697),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(573)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -101550,7 +102475,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(700),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(576)),
             },
         );
         ports.insert(
@@ -101558,7 +102483,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(701),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(576)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -101590,7 +102515,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(705),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(580)),
             },
         );
         ports.insert(
@@ -101598,7 +102523,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(706),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(580)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -101630,7 +102555,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(710),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(584)),
             },
         );
         ports.insert(
@@ -101638,7 +102563,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(711),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(584)),
+                produced_by: Some(NodeId(585)),
             },
         );
         ports.insert(
@@ -101646,7 +102571,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(712),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(585)),
+                produced_by: Some(NodeId(586)),
             },
         );
         ports.insert(
@@ -101654,7 +102579,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(713),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(586)),
+                produced_by: Some(NodeId(587)),
             },
         );
         ports.insert(
@@ -101662,7 +102587,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(714),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(587)),
+                produced_by: Some(NodeId(588)),
             },
         );
         ports.insert(
@@ -101670,7 +102595,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(715),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(589)),
             },
         );
         ports.insert(
@@ -101678,7 +102603,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(716),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(588)),
+                produced_by: Some(NodeId(590)),
             },
         );
         ports.insert(
@@ -101686,7 +102611,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(717),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(589)),
+                produced_by: Some(NodeId(591)),
             },
         );
         ports.insert(
@@ -101694,7 +102619,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(718),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(590)),
+                produced_by: Some(NodeId(592)),
             },
         );
         ports.insert(
@@ -101702,31 +102627,31 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(719),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(591)),
+                produced_by: Some(NodeId(593)),
             },
         );
         ports.insert(
             PortId(720),
             Port {
                 id: PortId(720),
-                state: PortState::Uninferred,
-                produced_by: None,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1230))),
+                produced_by: Some(NodeId(594)),
             },
         );
         ports.insert(
             PortId(721),
             Port {
                 id: PortId(721),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(592)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1230))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(722),
             Port {
                 id: PortId(722),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(593)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1230))),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -101734,78 +102659,78 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(723),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(594)),
+                produced_by: Some(NodeId(596)),
             },
         );
         ports.insert(
             PortId(724),
             Port {
                 id: PortId(724),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(595)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1230))),
+                produced_by: Some(NodeId(597)),
             },
         );
         ports.insert(
             PortId(725),
             Port {
                 id: PortId(725),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2513))),
-                produced_by: Some(NodeId(596)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(599)),
             },
         );
         ports.insert(
             PortId(726),
             Port {
                 id: PortId(726),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
-                produced_by: None,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1229))),
+                produced_by: Some(NodeId(600)),
             },
         );
         ports.insert(
             PortId(727),
             Port {
                 id: PortId(727),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(827))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(602)),
             },
         );
         ports.insert(
             PortId(728),
             Port {
                 id: PortId(728),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2514))),
-                produced_by: Some(NodeId(598)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1230))),
+                produced_by: Some(NodeId(603)),
             },
         );
         ports.insert(
             PortId(729),
             Port {
                 id: PortId(729),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2515))),
-                produced_by: Some(NodeId(600)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1230))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(730),
             Port {
                 id: PortId(730),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2516))),
-                produced_by: Some(NodeId(602)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1230))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(731),
             Port {
                 id: PortId(731),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2517))),
-                produced_by: Some(NodeId(604)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(605)),
             },
         );
         ports.insert(
             PortId(732),
             Port {
                 id: PortId(732),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2518))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1230))),
                 produced_by: Some(NodeId(606)),
             },
         );
@@ -101813,7 +102738,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(733),
             Port {
                 id: PortId(733),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2519))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2649))),
                 produced_by: Some(NodeId(608)),
             },
         );
@@ -101821,15 +102746,15 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(734),
             Port {
                 id: PortId(734),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2521))),
-                produced_by: Some(NodeId(610)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(827))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(735),
             Port {
                 id: PortId(735),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1238))),
+                state: PortState::Uninferred,
                 produced_by: None,
             },
         );
@@ -101838,7 +102763,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(736),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(612)),
+                produced_by: Some(NodeId(610)),
             },
         );
         ports.insert(
@@ -101846,22 +102771,22 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(737),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(613)),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(738),
             Port {
                 id: PortId(738),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2523))),
-                produced_by: Some(NodeId(614)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(611)),
             },
         );
         ports.insert(
             PortId(739),
             Port {
                 id: PortId(739),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(982))),
+                state: PortState::Uninferred,
                 produced_by: None,
             },
         );
@@ -101870,23 +102795,23 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(740),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(616)),
+                produced_by: Some(NodeId(612)),
             },
         );
         ports.insert(
             PortId(741),
             Port {
                 id: PortId(741),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2524))),
-                produced_by: Some(NodeId(617)),
+                state: PortState::Uninferred,
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(742),
             Port {
                 id: PortId(742),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1238))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(613)),
             },
         );
         ports.insert(
@@ -101894,7 +102819,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(743),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(619)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -101902,22 +102827,22 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(744),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(620)),
+                produced_by: Some(NodeId(614)),
             },
         );
         ports.insert(
             PortId(745),
             Port {
                 id: PortId(745),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2525))),
-                produced_by: Some(NodeId(621)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(159))),
+                produced_by: Some(NodeId(615)),
             },
         );
         ports.insert(
             PortId(746),
             Port {
                 id: PortId(746),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1238))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(230))),
                 produced_by: None,
             },
         );
@@ -101925,7 +102850,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(747),
             Port {
                 id: PortId(747),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(982))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(159))),
                 produced_by: None,
             },
         );
@@ -101934,7 +102859,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(748),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(623)),
+                produced_by: Some(NodeId(617)),
             },
         );
         ports.insert(
@@ -101942,7 +102867,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(749),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(624)),
+                produced_by: Some(NodeId(618)),
             },
         );
         ports.insert(
@@ -101950,31 +102875,31 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(750),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(625)),
+                produced_by: Some(NodeId(619)),
             },
         );
         ports.insert(
             PortId(751),
             Port {
                 id: PortId(751),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2526))),
-                produced_by: Some(NodeId(626)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1039))),
+                produced_by: Some(NodeId(620)),
             },
         );
         ports.insert(
             PortId(752),
             Port {
                 id: PortId(752),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(622)),
             },
         );
         ports.insert(
             PortId(753),
             Port {
                 id: PortId(753),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1238))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(623)),
             },
         );
         ports.insert(
@@ -101982,22 +102907,22 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(754),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(628)),
+                produced_by: Some(NodeId(624)),
             },
         );
         ports.insert(
             PortId(755),
             Port {
                 id: PortId(755),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(629)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(159))),
+                produced_by: Some(NodeId(625)),
             },
         );
         ports.insert(
             PortId(756),
             Port {
                 id: PortId(756),
-                state: PortState::Uninferred,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
                 produced_by: None,
             },
         );
@@ -102005,8 +102930,8 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(757),
             Port {
                 id: PortId(757),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(630)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(230))),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -102014,47 +102939,47 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(758),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(631)),
+                produced_by: Some(NodeId(627)),
             },
         );
         ports.insert(
             PortId(759),
             Port {
                 id: PortId(759),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(632)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2017))),
+                produced_by: Some(NodeId(628)),
             },
         );
         ports.insert(
             PortId(760),
             Port {
                 id: PortId(760),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2527))),
-                produced_by: Some(NodeId(633)),
+                state: PortState::Uninferred,
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(761),
             Port {
                 id: PortId(761),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(629)),
             },
         );
         ports.insert(
             PortId(762),
             Port {
                 id: PortId(762),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1238))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(630)),
             },
         );
         ports.insert(
             PortId(763),
             Port {
                 id: PortId(763),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(982))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(631)),
             },
         );
         ports.insert(
@@ -102062,7 +102987,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(764),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(635)),
+                produced_by: Some(NodeId(632)),
             },
         );
         ports.insert(
@@ -102070,7 +102995,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(765),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(636)),
+                produced_by: Some(NodeId(633)),
             },
         );
         ports.insert(
@@ -102078,7 +103003,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(766),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(634)),
             },
         );
         ports.insert(
@@ -102086,7 +103011,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(767),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(637)),
+                produced_by: Some(NodeId(635)),
             },
         );
         ports.insert(
@@ -102094,7 +103019,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(768),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(638)),
+                produced_by: Some(NodeId(636)),
             },
         );
         ports.insert(
@@ -102102,54 +103027,54 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(769),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(639)),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(770),
             Port {
                 id: PortId(770),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2528))),
-                produced_by: Some(NodeId(640)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(637)),
             },
         );
         ports.insert(
             PortId(771),
             Port {
                 id: PortId(771),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(638)),
             },
         );
         ports.insert(
             PortId(772),
             Port {
                 id: PortId(772),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1238))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(639)),
             },
         );
         ports.insert(
             PortId(773),
             Port {
                 id: PortId(773),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(986))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(640)),
             },
         );
         ports.insert(
             PortId(774),
             Port {
                 id: PortId(774),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(642)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1043))),
+                produced_by: Some(NodeId(641)),
             },
         );
         ports.insert(
             PortId(775),
             Port {
                 id: PortId(775),
-                state: PortState::Uninferred,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1230))),
                 produced_by: None,
             },
         );
@@ -102157,8 +103082,8 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(776),
             Port {
                 id: PortId(776),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(643)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(818))),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -102166,22 +103091,22 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(777),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(644)),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(778),
             Port {
                 id: PortId(778),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2529))),
-                produced_by: Some(NodeId(645)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(643)),
             },
         );
         ports.insert(
             PortId(779),
             Port {
                 id: PortId(779),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Uninferred,
                 produced_by: None,
             },
         );
@@ -102189,8 +103114,8 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(780),
             Port {
                 id: PortId(780),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2530))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(644)),
             },
         );
         ports.insert(
@@ -102206,7 +103131,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(782),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(647)),
+                produced_by: Some(NodeId(645)),
             },
         );
         ports.insert(
@@ -102214,7 +103139,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(783),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(648)),
+                produced_by: Some(NodeId(646)),
             },
         );
         ports.insert(
@@ -102222,7 +103147,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(784),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(647)),
             },
         );
         ports.insert(
@@ -102230,7 +103155,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(785),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(649)),
+                produced_by: Some(NodeId(648)),
             },
         );
         ports.insert(
@@ -102238,31 +103163,31 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(786),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(650)),
+                produced_by: Some(NodeId(649)),
             },
         );
         ports.insert(
             PortId(787),
             Port {
                 id: PortId(787),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(651)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1230))),
+                produced_by: Some(NodeId(650)),
             },
         );
         ports.insert(
             PortId(788),
             Port {
                 id: PortId(788),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(652)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(789),
             Port {
                 id: PortId(789),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(653)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(827))),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -102270,31 +103195,31 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(790),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(654)),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(791),
             Port {
                 id: PortId(791),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2531))),
-                produced_by: Some(NodeId(655)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(652)),
             },
         );
         ports.insert(
             PortId(792),
             Port {
                 id: PortId(792),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(653)),
             },
         );
         ports.insert(
             PortId(793),
             Port {
                 id: PortId(793),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(827))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(654)),
             },
         );
         ports.insert(
@@ -102302,7 +103227,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(794),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(657)),
+                produced_by: Some(NodeId(655)),
             },
         );
         ports.insert(
@@ -102310,7 +103235,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(795),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(658)),
+                produced_by: Some(NodeId(656)),
             },
         );
         ports.insert(
@@ -102318,7 +103243,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(796),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(659)),
+                produced_by: Some(NodeId(657)),
             },
         );
         ports.insert(
@@ -102326,7 +103251,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(797),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(660)),
+                produced_by: Some(NodeId(658)),
             },
         );
         ports.insert(
@@ -102334,7 +103259,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(798),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(661)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -102342,62 +103267,62 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(799),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(662)),
+                produced_by: Some(NodeId(659)),
             },
         );
         ports.insert(
             PortId(800),
             Port {
                 id: PortId(800),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2532))),
-                produced_by: Some(NodeId(663)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(660)),
             },
         );
         ports.insert(
             PortId(801),
             Port {
                 id: PortId(801),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(158))),
-                produced_by: Some(NodeId(665)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(661)),
             },
         );
         ports.insert(
             PortId(802),
             Port {
                 id: PortId(802),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(721))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(662)),
             },
         );
         ports.insert(
             PortId(803),
             Port {
                 id: PortId(803),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(173))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(663)),
             },
         );
         ports.insert(
             PortId(804),
             Port {
                 id: PortId(804),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(174))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(664)),
             },
         );
         ports.insert(
             PortId(805),
             Port {
                 id: PortId(805),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(177))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(665)),
             },
         );
         ports.insert(
             PortId(806),
             Port {
                 id: PortId(806),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1237))),
+                state: PortState::Uninferred,
                 produced_by: None,
             },
         );
@@ -102405,40 +103330,40 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(807),
             Port {
                 id: PortId(807),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1240))),
-                produced_by: Some(NodeId(667)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(666)),
             },
         );
         ports.insert(
             PortId(808),
             Port {
                 id: PortId(808),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1238))),
-                produced_by: Some(NodeId(669)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(667)),
             },
         );
         ports.insert(
             PortId(809),
             Port {
                 id: PortId(809),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1238))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(668)),
             },
         );
         ports.insert(
             PortId(810),
             Port {
                 id: PortId(810),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1238))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(669)),
             },
         );
         ports.insert(
             PortId(811),
             Port {
                 id: PortId(811),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(670)),
             },
         );
         ports.insert(
@@ -102462,7 +103387,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(814),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(673)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -102470,7 +103395,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(815),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(674)),
+                produced_by: Some(NodeId(673)),
             },
         );
         ports.insert(
@@ -102478,7 +103403,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(816),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(674)),
             },
         );
         ports.insert(
@@ -102526,7 +103451,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(822),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(680)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -102534,7 +103459,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(823),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(680)),
             },
         );
         ports.insert(
@@ -102566,7 +103491,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(827),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(684)),
             },
         );
         ports.insert(
@@ -102574,7 +103499,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(828),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(684)),
+                produced_by: Some(NodeId(685)),
             },
         );
         ports.insert(
@@ -102582,30 +103507,30 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(829),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(685)),
+                produced_by: Some(NodeId(686)),
             },
         );
         ports.insert(
             PortId(830),
             Port {
                 id: PortId(830),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(686)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2650))),
+                produced_by: Some(NodeId(687)),
             },
         );
         ports.insert(
             PortId(831),
             Port {
                 id: PortId(831),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(687)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(832),
             Port {
                 id: PortId(832),
-                state: PortState::Uninferred,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1230))),
                 produced_by: None,
             },
         );
@@ -102614,7 +103539,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(833),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(688)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -102717,7 +103642,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(846),
             Port {
                 id: PortId(846),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1238))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1043))),
                 produced_by: Some(NodeId(701)),
             },
         );
@@ -102725,15 +103650,15 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(847),
             Port {
                 id: PortId(847),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1238))),
-                produced_by: None,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(76))),
+                produced_by: Some(NodeId(703)),
             },
         );
         ports.insert(
             PortId(848),
             Port {
                 id: PortId(848),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1238))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1230))),
                 produced_by: None,
             },
         );
@@ -102742,15 +103667,15 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(849),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(703)),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(850),
             Port {
                 id: PortId(850),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1238))),
-                produced_by: Some(NodeId(704)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(705)),
             },
         );
         ports.insert(
@@ -102765,7 +103690,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(852),
             Port {
                 id: PortId(852),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1237))),
+                state: PortState::Uninferred,
                 produced_by: Some(NodeId(707)),
             },
         );
@@ -102774,30 +103699,30 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(853),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(709)),
+                produced_by: Some(NodeId(708)),
             },
         );
         ports.insert(
             PortId(854),
             Port {
                 id: PortId(854),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1238))),
-                produced_by: Some(NodeId(710)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(709)),
             },
         );
         ports.insert(
             PortId(855),
             Port {
                 id: PortId(855),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1238))),
-                produced_by: None,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1237))),
+                produced_by: Some(NodeId(710)),
             },
         );
         ports.insert(
             PortId(856),
             Port {
                 id: PortId(856),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1238))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1230))),
                 produced_by: None,
             },
         );
@@ -102805,48 +103730,48 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(857),
             Port {
                 id: PortId(857),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(712)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1236))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(858),
             Port {
                 id: PortId(858),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1238))),
-                produced_by: Some(NodeId(713)),
+                state: PortState::Uninferred,
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(859),
             Port {
                 id: PortId(859),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2589))),
-                produced_by: Some(NodeId(715)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(712)),
             },
         );
         ports.insert(
             PortId(860),
             Port {
                 id: PortId(860),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(827))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(713)),
             },
         );
         ports.insert(
             PortId(861),
             Port {
                 id: PortId(861),
-                state: PortState::Uninferred,
-                produced_by: None,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1229))),
+                produced_by: Some(NodeId(714)),
             },
         );
         ports.insert(
             PortId(862),
             Port {
                 id: PortId(862),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(717)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(76))),
+                produced_by: Some(NodeId(715)),
             },
         );
         ports.insert(
@@ -102854,7 +103779,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(863),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(716)),
             },
         );
         ports.insert(
@@ -102862,7 +103787,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(864),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(718)),
+                produced_by: Some(NodeId(717)),
             },
         );
         ports.insert(
@@ -102870,7 +103795,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(865),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(718)),
             },
         );
         ports.insert(
@@ -102886,7 +103811,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(867),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(720)),
             },
         );
         ports.insert(
@@ -102894,7 +103819,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(868),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(720)),
+                produced_by: Some(NodeId(721)),
             },
         );
         ports.insert(
@@ -102902,7 +103827,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(869),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(722)),
             },
         );
         ports.insert(
@@ -102910,31 +103835,31 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(870),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(721)),
+                produced_by: Some(NodeId(723)),
             },
         );
         ports.insert(
             PortId(871),
             Port {
                 id: PortId(871),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(159))),
-                produced_by: Some(NodeId(722)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(724)),
             },
         );
         ports.insert(
             PortId(872),
             Port {
                 id: PortId(872),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(230))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(725)),
             },
         );
         ports.insert(
             PortId(873),
             Port {
                 id: PortId(873),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(159))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(726)),
             },
         );
         ports.insert(
@@ -102942,7 +103867,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(874),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(724)),
+                produced_by: Some(NodeId(727)),
             },
         );
         ports.insert(
@@ -102950,7 +103875,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(875),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(725)),
+                produced_by: Some(NodeId(728)),
             },
         );
         ports.insert(
@@ -102958,15 +103883,15 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(876),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(726)),
+                produced_by: Some(NodeId(729)),
             },
         );
         ports.insert(
             PortId(877),
             Port {
                 id: PortId(877),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(982))),
-                produced_by: Some(NodeId(727)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(730)),
             },
         );
         ports.insert(
@@ -102974,7 +103899,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(878),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(729)),
+                produced_by: Some(NodeId(731)),
             },
         );
         ports.insert(
@@ -102982,30 +103907,30 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(879),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(730)),
+                produced_by: Some(NodeId(732)),
             },
         );
         ports.insert(
             PortId(880),
             Port {
                 id: PortId(880),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(731)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
+                produced_by: Some(NodeId(733)),
             },
         );
         ports.insert(
             PortId(881),
             Port {
                 id: PortId(881),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(159))),
-                produced_by: Some(NodeId(732)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(882),
             Port {
                 id: PortId(882),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(827))),
                 produced_by: None,
             },
         );
@@ -103013,7 +103938,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(883),
             Port {
                 id: PortId(883),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(230))),
+                state: PortState::Uninferred,
                 produced_by: None,
             },
         );
@@ -103022,15 +103947,15 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(884),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(734)),
+                produced_by: Some(NodeId(735)),
             },
         );
         ports.insert(
             PortId(885),
             Port {
                 id: PortId(885),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2003))),
-                produced_by: Some(NodeId(735)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(736)),
             },
         );
         ports.insert(
@@ -103038,7 +103963,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(886),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(737)),
             },
         );
         ports.insert(
@@ -103046,7 +103971,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(887),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(736)),
+                produced_by: Some(NodeId(738)),
             },
         );
         ports.insert(
@@ -103054,7 +103979,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(888),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(737)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -103062,7 +103987,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(889),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(738)),
+                produced_by: Some(NodeId(739)),
             },
         );
         ports.insert(
@@ -103070,7 +103995,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(890),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(739)),
+                produced_by: Some(NodeId(740)),
             },
         );
         ports.insert(
@@ -103078,7 +104003,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(891),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(740)),
+                produced_by: Some(NodeId(741)),
             },
         );
         ports.insert(
@@ -103086,7 +104011,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(892),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(741)),
+                produced_by: Some(NodeId(742)),
             },
         );
         ports.insert(
@@ -103094,7 +104019,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(893),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(742)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -103110,7 +104035,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(895),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(744)),
             },
         );
         ports.insert(
@@ -103118,7 +104043,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(896),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(744)),
+                produced_by: Some(NodeId(745)),
             },
         );
         ports.insert(
@@ -103126,7 +104051,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(897),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(745)),
+                produced_by: Some(NodeId(746)),
             },
         );
         ports.insert(
@@ -103134,7 +104059,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(898),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(746)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -103149,7 +104074,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(900),
             Port {
                 id: PortId(900),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(986))),
+                state: PortState::Uninferred,
                 produced_by: Some(NodeId(748)),
             },
         );
@@ -103157,16 +104082,16 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(901),
             Port {
                 id: PortId(901),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1238))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(749)),
             },
         );
         ports.insert(
             PortId(902),
             Port {
                 id: PortId(902),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(818))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(750)),
             },
         );
         ports.insert(
@@ -103182,7 +104107,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(904),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(750)),
+                produced_by: Some(NodeId(751)),
             },
         );
         ports.insert(
@@ -103190,7 +104115,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(905),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(752)),
             },
         );
         ports.insert(
@@ -103198,7 +104123,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(906),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(751)),
+                produced_by: Some(NodeId(753)),
             },
         );
         ports.insert(
@@ -103206,7 +104131,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(907),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(754)),
             },
         );
         ports.insert(
@@ -103214,7 +104139,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(908),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(752)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -103222,7 +104147,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(909),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(753)),
+                produced_by: Some(NodeId(755)),
             },
         );
         ports.insert(
@@ -103230,7 +104155,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(910),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(754)),
+                produced_by: Some(NodeId(756)),
             },
         );
         ports.insert(
@@ -103238,7 +104163,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(911),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(755)),
+                produced_by: Some(NodeId(757)),
             },
         );
         ports.insert(
@@ -103246,31 +104171,31 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(912),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(756)),
+                produced_by: Some(NodeId(758)),
             },
         );
         ports.insert(
             PortId(913),
             Port {
                 id: PortId(913),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1238))),
-                produced_by: Some(NodeId(757)),
+                state: PortState::Uninferred,
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(914),
             Port {
                 id: PortId(914),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(759)),
             },
         );
         ports.insert(
             PortId(915),
             Port {
                 id: PortId(915),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(827))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(760)),
             },
         );
         ports.insert(
@@ -103278,7 +104203,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(916),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(761)),
             },
         );
         ports.insert(
@@ -103286,7 +104211,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(917),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(759)),
+                produced_by: Some(NodeId(762)),
             },
         );
         ports.insert(
@@ -103294,7 +104219,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(918),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(760)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -103302,7 +104227,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(919),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(761)),
+                produced_by: Some(NodeId(763)),
             },
         );
         ports.insert(
@@ -103310,7 +104235,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(920),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(762)),
+                produced_by: Some(NodeId(764)),
             },
         );
         ports.insert(
@@ -103318,7 +104243,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(921),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(763)),
+                produced_by: Some(NodeId(765)),
             },
         );
         ports.insert(
@@ -103326,7 +104251,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(922),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(764)),
+                produced_by: Some(NodeId(766)),
             },
         );
         ports.insert(
@@ -103334,7 +104259,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(923),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(765)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -103342,7 +104267,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(924),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(767)),
             },
         );
         ports.insert(
@@ -103350,7 +104275,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(925),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(766)),
+                produced_by: Some(NodeId(768)),
             },
         );
         ports.insert(
@@ -103358,7 +104283,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(926),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(767)),
+                produced_by: Some(NodeId(769)),
             },
         );
         ports.insert(
@@ -103366,7 +104291,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(927),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(768)),
+                produced_by: Some(NodeId(770)),
             },
         );
         ports.insert(
@@ -103374,7 +104299,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(928),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(769)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -103382,7 +104307,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(929),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(770)),
+                produced_by: Some(NodeId(771)),
             },
         );
         ports.insert(
@@ -103390,7 +104315,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(930),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(771)),
+                produced_by: Some(NodeId(772)),
             },
         );
         ports.insert(
@@ -103398,7 +104323,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(931),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(772)),
+                produced_by: Some(NodeId(773)),
             },
         );
         ports.insert(
@@ -103406,95 +104331,95 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(932),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(774)),
             },
         );
         ports.insert(
             PortId(933),
             Port {
                 id: PortId(933),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(773)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2672))),
+                produced_by: Some(NodeId(775)),
             },
         );
         ports.insert(
             PortId(934),
             Port {
                 id: PortId(934),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(774)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(935),
             Port {
                 id: PortId(935),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(775)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(827))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(936),
             Port {
                 id: PortId(936),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(776)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2673))),
+                produced_by: Some(NodeId(777)),
             },
         );
         ports.insert(
             PortId(937),
             Port {
                 id: PortId(937),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(777)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2674))),
+                produced_by: Some(NodeId(779)),
             },
         );
         ports.insert(
             PortId(938),
             Port {
                 id: PortId(938),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(778)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2675))),
+                produced_by: Some(NodeId(781)),
             },
         );
         ports.insert(
             PortId(939),
             Port {
                 id: PortId(939),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(779)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2676))),
+                produced_by: Some(NodeId(783)),
             },
         );
         ports.insert(
             PortId(940),
             Port {
                 id: PortId(940),
-                state: PortState::Uninferred,
-                produced_by: None,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2677))),
+                produced_by: Some(NodeId(785)),
             },
         );
         ports.insert(
             PortId(941),
             Port {
                 id: PortId(941),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(780)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2678))),
+                produced_by: Some(NodeId(787)),
             },
         );
         ports.insert(
             PortId(942),
             Port {
                 id: PortId(942),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(781)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2680))),
+                produced_by: Some(NodeId(789)),
             },
         );
         ports.insert(
             PortId(943),
             Port {
                 id: PortId(943),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(782)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1230))),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -103502,7 +104427,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(944),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(783)),
+                produced_by: Some(NodeId(791)),
             },
         );
         ports.insert(
@@ -103510,23 +104435,23 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(945),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(784)),
+                produced_by: Some(NodeId(792)),
             },
         );
         ports.insert(
             PortId(946),
             Port {
                 id: PortId(946),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(785)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2682))),
+                produced_by: Some(NodeId(793)),
             },
         );
         ports.insert(
             PortId(947),
             Port {
                 id: PortId(947),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(786)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1039))),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -103534,23 +104459,23 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(948),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(795)),
             },
         );
         ports.insert(
             PortId(949),
             Port {
                 id: PortId(949),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(787)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2683))),
+                produced_by: Some(NodeId(796)),
             },
         );
         ports.insert(
             PortId(950),
             Port {
                 id: PortId(950),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(788)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1230))),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -103558,7 +104483,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(951),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(789)),
+                produced_by: Some(NodeId(798)),
             },
         );
         ports.insert(
@@ -103566,79 +104491,79 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(952),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(790)),
+                produced_by: Some(NodeId(799)),
             },
         );
         ports.insert(
             PortId(953),
             Port {
                 id: PortId(953),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(791)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2684))),
+                produced_by: Some(NodeId(800)),
             },
         );
         ports.insert(
             PortId(954),
             Port {
                 id: PortId(954),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(792)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1230))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(955),
             Port {
                 id: PortId(955),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(793)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1039))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(956),
             Port {
                 id: PortId(956),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2590))),
-                produced_by: Some(NodeId(794)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(802)),
             },
         );
         ports.insert(
             PortId(957),
             Port {
                 id: PortId(957),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(803)),
             },
         );
         ports.insert(
             PortId(958),
             Port {
                 id: PortId(958),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1238))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(804)),
             },
         );
         ports.insert(
             PortId(959),
             Port {
                 id: PortId(959),
-                state: PortState::Uninferred,
-                produced_by: None,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2685))),
+                produced_by: Some(NodeId(805)),
             },
         );
         ports.insert(
             PortId(960),
             Port {
                 id: PortId(960),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(796)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(961),
             Port {
                 id: PortId(961),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(797)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1230))),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -103646,7 +104571,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(962),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(798)),
+                produced_by: Some(NodeId(807)),
             },
         );
         ports.insert(
@@ -103654,7 +104579,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(963),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(799)),
+                produced_by: Some(NodeId(808)),
             },
         );
         ports.insert(
@@ -103662,7 +104587,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(964),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(800)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -103670,7 +104595,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(965),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(801)),
+                produced_by: Some(NodeId(809)),
             },
         );
         ports.insert(
@@ -103678,7 +104603,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(966),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(802)),
+                produced_by: Some(NodeId(810)),
             },
         );
         ports.insert(
@@ -103686,55 +104611,55 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(967),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(803)),
+                produced_by: Some(NodeId(811)),
             },
         );
         ports.insert(
             PortId(968),
             Port {
                 id: PortId(968),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(804)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2686))),
+                produced_by: Some(NodeId(812)),
             },
         );
         ports.insert(
             PortId(969),
             Port {
                 id: PortId(969),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(805)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(970),
             Port {
                 id: PortId(970),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(806)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1230))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(971),
             Port {
                 id: PortId(971),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(807)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1039))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(972),
             Port {
                 id: PortId(972),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(986))),
-                produced_by: Some(NodeId(808)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(814)),
             },
         );
         ports.insert(
             PortId(973),
             Port {
                 id: PortId(973),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1301))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(815)),
             },
         );
         ports.insert(
@@ -103750,7 +104675,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(975),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(810)),
+                produced_by: Some(NodeId(816)),
             },
         );
         ports.insert(
@@ -103758,7 +104683,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(976),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(817)),
             },
         );
         ports.insert(
@@ -103766,15 +104691,15 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(977),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(811)),
+                produced_by: Some(NodeId(818)),
             },
         );
         ports.insert(
             PortId(978),
             Port {
                 id: PortId(978),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1303))),
-                produced_by: Some(NodeId(812)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2687))),
+                produced_by: Some(NodeId(819)),
             },
         );
         ports.insert(
@@ -103789,15 +104714,15 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(980),
             Port {
                 id: PortId(980),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2766))),
-                produced_by: Some(NodeId(814)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1230))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(981),
             Port {
                 id: PortId(981),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(806))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1043))),
                 produced_by: None,
             },
         );
@@ -103806,7 +104731,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(982),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(821)),
             },
         );
         ports.insert(
@@ -103814,7 +104739,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(983),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(816)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -103822,7 +104747,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(984),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(817)),
+                produced_by: Some(NodeId(822)),
             },
         );
         ports.insert(
@@ -103830,30 +104755,30 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(985),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(818)),
+                produced_by: Some(NodeId(823)),
             },
         );
         ports.insert(
             PortId(986),
             Port {
                 id: PortId(986),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(819)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2688))),
+                produced_by: Some(NodeId(824)),
             },
         );
         ports.insert(
             PortId(987),
             Port {
                 id: PortId(987),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(820)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(988),
             Port {
                 id: PortId(988),
-                state: PortState::Uninferred,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2689))),
                 produced_by: None,
             },
         );
@@ -103862,7 +104787,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(989),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(821)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -103870,7 +104795,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(990),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(822)),
+                produced_by: Some(NodeId(826)),
             },
         );
         ports.insert(
@@ -103878,7 +104803,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(991),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(823)),
+                produced_by: Some(NodeId(827)),
             },
         );
         ports.insert(
@@ -103886,7 +104811,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(992),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(824)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -103894,7 +104819,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(993),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(825)),
+                produced_by: Some(NodeId(828)),
             },
         );
         ports.insert(
@@ -103902,7 +104827,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(994),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(826)),
+                produced_by: Some(NodeId(829)),
             },
         );
         ports.insert(
@@ -103910,7 +104835,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(995),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(827)),
+                produced_by: Some(NodeId(830)),
             },
         );
         ports.insert(
@@ -103918,7 +104843,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(996),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(831)),
             },
         );
         ports.insert(
@@ -103926,7 +104851,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(997),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(828)),
+                produced_by: Some(NodeId(832)),
             },
         );
         ports.insert(
@@ -103934,30 +104859,30 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(998),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(829)),
+                produced_by: Some(NodeId(833)),
             },
         );
         ports.insert(
             PortId(999),
             Port {
                 id: PortId(999),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(830)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2690))),
+                produced_by: Some(NodeId(834)),
             },
         );
         ports.insert(
             PortId(1000),
             Port {
                 id: PortId(1000),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(230))),
-                produced_by: Some(NodeId(831)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(1001),
             Port {
                 id: PortId(1001),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(806))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(827))),
                 produced_by: None,
             },
         );
@@ -103966,7 +104891,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(1002),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(836)),
             },
         );
         ports.insert(
@@ -103974,7 +104899,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(1003),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(833)),
+                produced_by: Some(NodeId(837)),
             },
         );
         ports.insert(
@@ -103982,7 +104907,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(1004),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(834)),
+                produced_by: Some(NodeId(838)),
             },
         );
         ports.insert(
@@ -103990,7 +104915,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(1005),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(835)),
+                produced_by: Some(NodeId(839)),
             },
         );
         ports.insert(
@@ -103998,7 +104923,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(1006),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(836)),
+                produced_by: Some(NodeId(840)),
             },
         );
         ports.insert(
@@ -104006,23 +104931,23 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(1007),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(837)),
+                produced_by: Some(NodeId(841)),
             },
         );
         ports.insert(
             PortId(1008),
             Port {
                 id: PortId(1008),
-                state: PortState::Uninferred,
-                produced_by: None,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2691))),
+                produced_by: Some(NodeId(842)),
             },
         );
         ports.insert(
             PortId(1009),
             Port {
                 id: PortId(1009),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(838)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1316))),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -104030,7 +104955,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(1010),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(839)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -104038,7 +104963,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(1011),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(840)),
+                produced_by: Some(NodeId(844)),
             },
         );
         ports.insert(
@@ -104046,7 +104971,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(1012),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(841)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -104054,23 +104979,23 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(1013),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(842)),
+                produced_by: Some(NodeId(845)),
             },
         );
         ports.insert(
             PortId(1014),
             Port {
                 id: PortId(1014),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(843)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1318))),
+                produced_by: Some(NodeId(846)),
             },
         );
         ports.insert(
             PortId(1015),
             Port {
                 id: PortId(1015),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(844)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(806))),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -104086,7 +105011,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(1017),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(845)),
+                produced_by: Some(NodeId(848)),
             },
         );
         ports.insert(
@@ -104094,7 +105019,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(1018),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(846)),
+                produced_by: Some(NodeId(849)),
             },
         );
         ports.insert(
@@ -104102,23 +105027,23 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(1019),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(847)),
+                produced_by: Some(NodeId(850)),
             },
         );
         ports.insert(
             PortId(1020),
             Port {
                 id: PortId(1020),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(230))),
-                produced_by: Some(NodeId(848)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(851)),
             },
         );
         ports.insert(
             PortId(1021),
             Port {
                 id: PortId(1021),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(151))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(852)),
             },
         );
         ports.insert(
@@ -104126,7 +105051,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(1022),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(850)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -104134,7 +105059,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(1023),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(851)),
+                produced_by: Some(NodeId(853)),
             },
         );
         ports.insert(
@@ -104142,7 +105067,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(1024),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(852)),
+                produced_by: Some(NodeId(854)),
             },
         );
         ports.insert(
@@ -104150,7 +105075,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(1025),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(853)),
+                produced_by: Some(NodeId(855)),
             },
         );
         ports.insert(
@@ -104158,7 +105083,279 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             Port {
                 id: PortId(1026),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(854)),
+                produced_by: Some(NodeId(856)),
+            },
+        );
+        ports.insert(
+            PortId(1027),
+            Port {
+                id: PortId(1027),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(857)),
+            },
+        );
+        ports.insert(
+            PortId(1028),
+            Port {
+                id: PortId(1028),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(858)),
+            },
+        );
+        ports.insert(
+            PortId(1029),
+            Port {
+                id: PortId(1029),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(859)),
+            },
+        );
+        ports.insert(
+            PortId(1030),
+            Port {
+                id: PortId(1030),
+                state: PortState::Uninferred,
+                produced_by: None,
+            },
+        );
+        ports.insert(
+            PortId(1031),
+            Port {
+                id: PortId(1031),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(860)),
+            },
+        );
+        ports.insert(
+            PortId(1032),
+            Port {
+                id: PortId(1032),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(861)),
+            },
+        );
+        ports.insert(
+            PortId(1033),
+            Port {
+                id: PortId(1033),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(862)),
+            },
+        );
+        ports.insert(
+            PortId(1034),
+            Port {
+                id: PortId(1034),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(230))),
+                produced_by: Some(NodeId(863)),
+            },
+        );
+        ports.insert(
+            PortId(1035),
+            Port {
+                id: PortId(1035),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(806))),
+                produced_by: None,
+            },
+        );
+        ports.insert(
+            PortId(1036),
+            Port {
+                id: PortId(1036),
+                state: PortState::Uninferred,
+                produced_by: None,
+            },
+        );
+        ports.insert(
+            PortId(1037),
+            Port {
+                id: PortId(1037),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(865)),
+            },
+        );
+        ports.insert(
+            PortId(1038),
+            Port {
+                id: PortId(1038),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(866)),
+            },
+        );
+        ports.insert(
+            PortId(1039),
+            Port {
+                id: PortId(1039),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(867)),
+            },
+        );
+        ports.insert(
+            PortId(1040),
+            Port {
+                id: PortId(1040),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(868)),
+            },
+        );
+        ports.insert(
+            PortId(1041),
+            Port {
+                id: PortId(1041),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(869)),
+            },
+        );
+        ports.insert(
+            PortId(1042),
+            Port {
+                id: PortId(1042),
+                state: PortState::Uninferred,
+                produced_by: None,
+            },
+        );
+        ports.insert(
+            PortId(1043),
+            Port {
+                id: PortId(1043),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(870)),
+            },
+        );
+        ports.insert(
+            PortId(1044),
+            Port {
+                id: PortId(1044),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(871)),
+            },
+        );
+        ports.insert(
+            PortId(1045),
+            Port {
+                id: PortId(1045),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(872)),
+            },
+        );
+        ports.insert(
+            PortId(1046),
+            Port {
+                id: PortId(1046),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(873)),
+            },
+        );
+        ports.insert(
+            PortId(1047),
+            Port {
+                id: PortId(1047),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(874)),
+            },
+        );
+        ports.insert(
+            PortId(1048),
+            Port {
+                id: PortId(1048),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(875)),
+            },
+        );
+        ports.insert(
+            PortId(1049),
+            Port {
+                id: PortId(1049),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(876)),
+            },
+        );
+        ports.insert(
+            PortId(1050),
+            Port {
+                id: PortId(1050),
+                state: PortState::Uninferred,
+                produced_by: None,
+            },
+        );
+        ports.insert(
+            PortId(1051),
+            Port {
+                id: PortId(1051),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(877)),
+            },
+        );
+        ports.insert(
+            PortId(1052),
+            Port {
+                id: PortId(1052),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(878)),
+            },
+        );
+        ports.insert(
+            PortId(1053),
+            Port {
+                id: PortId(1053),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(879)),
+            },
+        );
+        ports.insert(
+            PortId(1054),
+            Port {
+                id: PortId(1054),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(230))),
+                produced_by: Some(NodeId(880)),
+            },
+        );
+        ports.insert(
+            PortId(1055),
+            Port {
+                id: PortId(1055),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(151))),
+                produced_by: None,
+            },
+        );
+        ports.insert(
+            PortId(1056),
+            Port {
+                id: PortId(1056),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(882)),
+            },
+        );
+        ports.insert(
+            PortId(1057),
+            Port {
+                id: PortId(1057),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(883)),
+            },
+        );
+        ports.insert(
+            PortId(1058),
+            Port {
+                id: PortId(1058),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(884)),
+            },
+        );
+        ports.insert(
+            PortId(1059),
+            Port {
+                id: PortId(1059),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(885)),
+            },
+        );
+        ports.insert(
+            PortId(1060),
+            Port {
+                id: PortId(1060),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(886)),
             },
         );
         ports
@@ -104176,145 +105373,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(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.insert(DeclarationId(389), DeclarationId(2958));
+        map.insert(DeclarationId(391), DeclarationId(2961));
+        map.insert(DeclarationId(423), DeclarationId(2964));
+        map.insert(DeclarationId(426), DeclarationId(2967));
+        map.insert(DeclarationId(471), DeclarationId(2970));
+        map.insert(DeclarationId(472), DeclarationId(2973));
+        map.insert(DeclarationId(473), DeclarationId(2976));
+        map.insert(DeclarationId(513), DeclarationId(2979));
+        map.insert(DeclarationId(515), DeclarationId(2982));
+        map.insert(DeclarationId(516), DeclarationId(2985));
+        map.insert(DeclarationId(539), DeclarationId(2988));
+        map.insert(DeclarationId(582), DeclarationId(2991));
+        map.insert(DeclarationId(602), DeclarationId(2994));
+        map.insert(DeclarationId(603), DeclarationId(2997));
+        map.insert(DeclarationId(605), DeclarationId(3000));
+        map.insert(DeclarationId(608), DeclarationId(3003));
+        map.insert(DeclarationId(613), DeclarationId(3006));
+        map.insert(DeclarationId(614), DeclarationId(3009));
+        map.insert(DeclarationId(618), DeclarationId(3012));
+        map.insert(DeclarationId(619), DeclarationId(3015));
+        map.insert(DeclarationId(620), DeclarationId(3018));
+        map.insert(DeclarationId(625), DeclarationId(3021));
+        map.insert(DeclarationId(1838), DeclarationId(3024));
+        map.insert(DeclarationId(1842), DeclarationId(3027));
+        map.insert(DeclarationId(1845), DeclarationId(3030));
+        map.insert(DeclarationId(1847), DeclarationId(3033));
+        map.insert(DeclarationId(1848), DeclarationId(3036));
+        map.insert(DeclarationId(1849), DeclarationId(3039));
+        map.insert(DeclarationId(1903), DeclarationId(3042));
+        map.insert(DeclarationId(1904), DeclarationId(3045));
+        map.insert(DeclarationId(1905), DeclarationId(3048));
+        map.insert(DeclarationId(1906), DeclarationId(3051));
+        map.insert(DeclarationId(1907), DeclarationId(3054));
+        map.insert(DeclarationId(1908), DeclarationId(3057));
+        map.insert(DeclarationId(1914), DeclarationId(3060));
+        map.insert(DeclarationId(1969), DeclarationId(3063));
+        map.insert(DeclarationId(1972), DeclarationId(3066));
+        map.insert(DeclarationId(1973), DeclarationId(3069));
+        map.insert(DeclarationId(1974), DeclarationId(3072));
+        map.insert(DeclarationId(1975), DeclarationId(3075));
+        map.insert(DeclarationId(1998), DeclarationId(3078));
+        map.insert(DeclarationId(2003), DeclarationId(3081));
+        map.insert(DeclarationId(2007), DeclarationId(3084));
+        map.insert(DeclarationId(2010), DeclarationId(3087));
+        map.insert(DeclarationId(2011), DeclarationId(3090));
+        map.insert(DeclarationId(2042), DeclarationId(3093));
+        map.insert(DeclarationId(2043), DeclarationId(3096));
+        map.insert(DeclarationId(2047), DeclarationId(3099));
+        map.insert(DeclarationId(2048), DeclarationId(3102));
+        map.insert(DeclarationId(2059), DeclarationId(3105));
+        map.insert(DeclarationId(2060), DeclarationId(3108));
+        map.insert(DeclarationId(2062), DeclarationId(3111));
+        map.insert(DeclarationId(2063), DeclarationId(3114));
+        map.insert(DeclarationId(2065), DeclarationId(3117));
+        map.insert(DeclarationId(2066), DeclarationId(3120));
+        map.insert(DeclarationId(2068), DeclarationId(3123));
+        map.insert(DeclarationId(2070), DeclarationId(3126));
+        map.insert(DeclarationId(2073), DeclarationId(3129));
+        map.insert(DeclarationId(2077), DeclarationId(3132));
+        map.insert(DeclarationId(2079), DeclarationId(3135));
+        map.insert(DeclarationId(2081), DeclarationId(3138));
+        map.insert(DeclarationId(2091), DeclarationId(3141));
+        map.insert(DeclarationId(2092), DeclarationId(3144));
+        map.insert(DeclarationId(2093), DeclarationId(3147));
+        map.insert(DeclarationId(2096), DeclarationId(3150));
+        map.insert(DeclarationId(2097), DeclarationId(3153));
+        map.insert(DeclarationId(2099), DeclarationId(3156));
+        map.insert(DeclarationId(2100), DeclarationId(3159));
+        map.insert(DeclarationId(2168), DeclarationId(3162));
+        map.insert(DeclarationId(2169), DeclarationId(3165));
+        map.insert(DeclarationId(2170), DeclarationId(3168));
+        map.insert(DeclarationId(2171), DeclarationId(3171));
+        map.insert(DeclarationId(2222), DeclarationId(3174));
+        map.insert(DeclarationId(2223), DeclarationId(3177));
+        map.insert(DeclarationId(2224), DeclarationId(3180));
+        map.insert(DeclarationId(2225), DeclarationId(3183));
+        map.insert(DeclarationId(2226), DeclarationId(3186));
+        map.insert(DeclarationId(2227), DeclarationId(3189));
+        map.insert(DeclarationId(2250), DeclarationId(3192));
+        map.insert(DeclarationId(2400), DeclarationId(3195));
+        map.insert(DeclarationId(2446), DeclarationId(3198));
+        map.insert(DeclarationId(2454), DeclarationId(3201));
+        map.insert(DeclarationId(2468), DeclarationId(3204));
+        map.insert(DeclarationId(2471), DeclarationId(3207));
+        map.insert(DeclarationId(2487), DeclarationId(3210));
+        map.insert(DeclarationId(2488), DeclarationId(3213));
+        map.insert(DeclarationId(2489), DeclarationId(3216));
+        map.insert(DeclarationId(2492), DeclarationId(3219));
+        map.insert(DeclarationId(2493), DeclarationId(3222));
+        map.insert(DeclarationId(2522), DeclarationId(3225));
+        map.insert(DeclarationId(2523), DeclarationId(3228));
+        map.insert(DeclarationId(2529), DeclarationId(3231));
+        map.insert(DeclarationId(2530), DeclarationId(3234));
+        map.insert(DeclarationId(2531), DeclarationId(3237));
+        map.insert(DeclarationId(2532), DeclarationId(3240));
+        map.insert(DeclarationId(2533), DeclarationId(3243));
+        map.insert(DeclarationId(2534), DeclarationId(3246));
+        map.insert(DeclarationId(2790), DeclarationId(3249));
+        map.insert(DeclarationId(2819), DeclarationId(3252));
+        map.insert(DeclarationId(2825), DeclarationId(3255));
+        map.insert(DeclarationId(2830), DeclarationId(3258));
+        map.insert(DeclarationId(2833), DeclarationId(3261));
+        map.insert(DeclarationId(2834), DeclarationId(3264));
+        map.insert(DeclarationId(2854), DeclarationId(3267));
+        map.insert(DeclarationId(2855), DeclarationId(3270));
+        map.insert(DeclarationId(2863), DeclarationId(3273));
+        map.insert(DeclarationId(2867), DeclarationId(3276));
+        map.insert(DeclarationId(2869), 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(2879), DeclarationId(3294));
+        map.insert(DeclarationId(2881), DeclarationId(3297));
+        map.insert(DeclarationId(2882), DeclarationId(3300));
+        map.insert(DeclarationId(2894), DeclarationId(3303));
+        map.insert(DeclarationId(2895), DeclarationId(3306));
+        map.insert(DeclarationId(2897), DeclarationId(3309));
+        map.insert(DeclarationId(2898), DeclarationId(3312));
+        map.insert(DeclarationId(2899), DeclarationId(3315));
+        map.insert(DeclarationId(2900), DeclarationId(3318));
+        map.insert(DeclarationId(2902), DeclarationId(3321));
+        map.insert(DeclarationId(2903), DeclarationId(3324));
+        map.insert(DeclarationId(2905), DeclarationId(3327));
+        map.insert(DeclarationId(2907), DeclarationId(3330));
+        map.insert(DeclarationId(2908), DeclarationId(3333));
+        map.insert(DeclarationId(2909), DeclarationId(3336));
+        map.insert(DeclarationId(2916), DeclarationId(3339));
+        map.insert(DeclarationId(2917), DeclarationId(3342));
+        map.insert(DeclarationId(2918), DeclarationId(3345));
+        map.insert(DeclarationId(2920), DeclarationId(3348));
+        map.insert(DeclarationId(2921), DeclarationId(3351));
+        map.insert(DeclarationId(2922), DeclarationId(3354));
+        map.insert(DeclarationId(2924), DeclarationId(3357));
+        map.insert(DeclarationId(2925), DeclarationId(3360));
+        map.insert(DeclarationId(2926), DeclarationId(3363));
+        map.insert(DeclarationId(2933), DeclarationId(3366));
+        map.insert(DeclarationId(2935), DeclarationId(3369));
+        map.insert(DeclarationId(2946), DeclarationId(3372));
         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 8bbe4b87a10..e8c70ac2bb4 100644
--- a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs
+++ b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs
@@ -7,9 +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(),
-        next_node_id: 856,
-        next_declaration_id: 2879,
-        next_port_id: 1027,
+        next_node_id: 888,
+        next_declaration_id: 2899,
+        next_port_id: 1061,
         primitives: PrimitiveCache::default(),
         substrate_markers: SubstrateMarkers::default(),
         realization_metas: RealizationMetaCache::default(),
@@ -24,14 +24,14 @@ 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: 2879,
+        declaration_append_begin_after_bootstrap: 2899,
     }
 }
 
 #[allow(clippy::vec_init_then_push)]
 fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
     {
-        let mut nodes = Vec::with_capacity(856);
+        let mut nodes = Vec::with_capacity(888);
         nodes.push(Behavior::Value(ValueNode {
             id: NodeId(0),
             data: LiteralBits::Int("0".to_string()),
@@ -1386,7 +1386,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(180),
-            target: TransformTarget::Callable(DeclarationId(850)),
+            target: TransformTarget::Callable(DeclarationId(906)),
             inputs: vec![PortId(183), PortId(182)],
             output: PortId(184),
             span: SourceSpan::new("src/v3/std/algebra.dag", 10291, 10322),
@@ -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(1682)),
+            target: TransformTarget::Callable(DeclarationId(1808)),
             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(1684)),
+            target: TransformTarget::Callable(DeclarationId(1810)),
             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(1628)),
+            target: TransformTarget::Callable(DeclarationId(1754)),
             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(1630)),
+            target: TransformTarget::Callable(DeclarationId(1756)),
             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(1685)),
+            target: TransformTarget::Callable(DeclarationId(1811)),
             inputs: vec![PortId(194)],
             output: PortId(195),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810),
@@ -1524,7 +1524,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(195),
-            target: TransformTarget::Callable(DeclarationId(857)),
+            target: TransformTarget::Callable(DeclarationId(913)),
             inputs: vec![PortId(203)],
             output: PortId(204),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11975, 12003),
@@ -1593,21 +1593,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(201),
-            target: TransformTarget::Callable(DeclarationId(854)),
+            target: TransformTarget::Callable(DeclarationId(910)),
             inputs: vec![PortId(209), PortId(210)],
             output: PortId(211),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12333, 12348),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(202),
-            target: TransformTarget::Callable(DeclarationId(1669)),
+            target: TransformTarget::Callable(DeclarationId(1795)),
             inputs: vec![PortId(211)],
             output: PortId(212),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12325, 12349),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(203),
-            target: TransformTarget::Callable(DeclarationId(870)),
+            target: TransformTarget::Callable(DeclarationId(926)),
             inputs: vec![PortId(212)],
             output: PortId(213),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12315, 12350),
@@ -1623,21 +1623,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(205),
-            target: TransformTarget::Callable(DeclarationId(854)),
+            target: TransformTarget::Callable(DeclarationId(910)),
             inputs: vec![PortId(214), PortId(215)],
             output: PortId(216),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12630, 12652),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(206),
-            target: TransformTarget::Callable(DeclarationId(1667)),
+            target: TransformTarget::Callable(DeclarationId(1793)),
             inputs: vec![PortId(216)],
             output: PortId(217),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12618, 12653),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(207),
-            target: TransformTarget::Callable(DeclarationId(870)),
+            target: TransformTarget::Callable(DeclarationId(926)),
             inputs: vec![PortId(217)],
             output: PortId(218),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12608, 12654),
@@ -1653,14 +1653,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(209),
-            target: TransformTarget::Callable(DeclarationId(863)),
+            target: TransformTarget::Callable(DeclarationId(919)),
             inputs: vec![PortId(220), PortId(219)],
             output: PortId(221),
             span: SourceSpan::new("src/v3/std/algebra.dag", 13598, 13623),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(210),
-            target: TransformTarget::Callable(DeclarationId(861)),
+            target: TransformTarget::Callable(DeclarationId(917)),
             inputs: vec![PortId(219), PortId(220)],
             output: PortId(222),
             span: SourceSpan::new("src/v3/std/algebra.dag", 13654, 13681),
@@ -1703,14 +1703,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(213),
-            target: TransformTarget::Callable(DeclarationId(863)),
+            target: TransformTarget::Callable(DeclarationId(919)),
             inputs: vec![PortId(224), PortId(225)],
             output: PortId(226),
             span: SourceSpan::new("src/v3/std/algebra.dag", 13765, 13790),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(214),
-            target: TransformTarget::Callable(DeclarationId(858)),
+            target: TransformTarget::Callable(DeclarationId(914)),
             inputs: vec![PortId(224), PortId(225)],
             output: PortId(227),
             span: SourceSpan::new("src/v3/std/algebra.dag", 13815, 13841),
@@ -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(1663)),
+            target: TransformTarget::Callable(DeclarationId(1789)),
             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(1687)),
+            target: TransformTarget::Callable(DeclarationId(1813)),
             inputs: vec![PortId(229), PortId(231)],
             output: PortId(232),
             span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245),
@@ -1946,7 +1946,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(232),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(920)),
             inputs: vec![PortId(253), PortId(258)],
             output: PortId(259),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15597, 15623),
@@ -2097,7 +2097,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(241),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(920)),
             inputs: vec![PortId(275), PortId(274)],
             output: PortId(276),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15912, 15942),
@@ -2122,7 +2122,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(244),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(920)),
             inputs: vec![PortId(278), PortId(279)],
             output: PortId(280),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15986, 16020),
@@ -2138,7 +2138,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(246),
-            target: TransformTarget::Callable(DeclarationId(857)),
+            target: TransformTarget::Callable(DeclarationId(913)),
             inputs: vec![PortId(281)],
             output: PortId(282),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16038, 16059),
@@ -2154,7 +2154,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(248),
-            target: TransformTarget::Callable(DeclarationId(857)),
+            target: TransformTarget::Callable(DeclarationId(913)),
             inputs: vec![PortId(283)],
             output: PortId(284),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16063, 16084),
@@ -2323,7 +2323,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(257),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(920)),
             inputs: vec![PortId(295), PortId(298)],
             output: PortId(299),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16308, 16334),
@@ -2458,56 +2458,56 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(264),
-            target: TransformTarget::Callable(DeclarationId(871)),
+            target: TransformTarget::Callable(DeclarationId(927)),
             inputs: vec![PortId(311)],
             output: PortId(312),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16927, 16945),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(265),
-            target: TransformTarget::Callable(DeclarationId(851)),
+            target: TransformTarget::Callable(DeclarationId(907)),
             inputs: vec![PortId(234)],
             output: PortId(313),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16957, 16978),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(266),
-            target: TransformTarget::Callable(DeclarationId(1689)),
+            target: TransformTarget::Callable(DeclarationId(1815)),
             inputs: vec![PortId(312), PortId(313)],
             output: PortId(314),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(267),
-            target: TransformTarget::Callable(DeclarationId(887)),
+            target: TransformTarget::Callable(DeclarationId(943)),
             inputs: vec![PortId(314)],
             output: PortId(315),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16893, 17029),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(268),
-            target: TransformTarget::Callable(DeclarationId(871)),
+            target: TransformTarget::Callable(DeclarationId(927)),
             inputs: vec![PortId(316)],
             output: PortId(317),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17092, 17110),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(269),
-            target: TransformTarget::Callable(DeclarationId(851)),
+            target: TransformTarget::Callable(DeclarationId(907)),
             inputs: vec![PortId(234)],
             output: PortId(318),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17122, 17143),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(270),
-            target: TransformTarget::Callable(DeclarationId(1691)),
+            target: TransformTarget::Callable(DeclarationId(1817)),
             inputs: vec![PortId(317), PortId(318)],
             output: PortId(319),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(271),
-            target: TransformTarget::Callable(DeclarationId(887)),
+            target: TransformTarget::Callable(DeclarationId(943)),
             inputs: vec![PortId(319)],
             output: PortId(320),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17058, 17194),
@@ -2616,7 +2616,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(274),
-            target: TransformTarget::Callable(DeclarationId(847)),
+            target: TransformTarget::Callable(DeclarationId(903)),
             inputs: vec![PortId(322), PortId(323)],
             output: PortId(324),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17268, 17290),
@@ -2811,14 +2811,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(290),
-            target: TransformTarget::Callable(DeclarationId(1206)),
+            target: TransformTarget::Callable(DeclarationId(1133)),
             inputs: vec![PortId(339)],
             output: PortId(344),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18897, 18924),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(291),
-            target: TransformTarget::Callable(DeclarationId(1206)),
+            target: TransformTarget::Callable(DeclarationId(1133)),
             inputs: vec![PortId(343)],
             output: PortId(345),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18928, 18955),
@@ -3744,7 +3744,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(346),
-            target: TransformTarget::Callable(DeclarationId(866)),
+            target: TransformTarget::Callable(DeclarationId(922)),
             inputs: vec![PortId(404), PortId(405)],
             output: PortId(406),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20681, 20707),
@@ -3787,7 +3787,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(349),
-            target: TransformTarget::Callable(DeclarationId(866)),
+            target: TransformTarget::Callable(DeclarationId(922)),
             inputs: vec![PortId(408), PortId(409)],
             output: PortId(410),
             span: SourceSpan::new("src/v3/std/algebra.dag", 20814, 20840),
@@ -3830,49 +3830,49 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(352),
-            target: TransformTarget::Callable(DeclarationId(871)),
+            target: TransformTarget::Callable(DeclarationId(927)),
             inputs: vec![PortId(413)],
             output: PortId(414),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22044, 22062),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(353),
-            target: TransformTarget::Callable(DeclarationId(872)),
+            target: TransformTarget::Callable(DeclarationId(928)),
             inputs: vec![PortId(414)],
             output: PortId(415),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22025, 22063),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(354),
-            target: TransformTarget::Callable(DeclarationId(878)),
+            target: TransformTarget::Callable(DeclarationId(934)),
             inputs: vec![PortId(415)],
             output: PortId(416),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22014, 22064),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(355),
-            target: TransformTarget::Callable(DeclarationId(871)),
+            target: TransformTarget::Callable(DeclarationId(927)),
             inputs: vec![PortId(417)],
             output: PortId(418),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22168, 22186),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(356),
-            target: TransformTarget::Callable(DeclarationId(873)),
+            target: TransformTarget::Callable(DeclarationId(929)),
             inputs: vec![PortId(418)],
             output: PortId(419),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22136, 22187),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(357),
-            target: TransformTarget::Callable(DeclarationId(875)),
+            target: TransformTarget::Callable(DeclarationId(931)),
             inputs: vec![PortId(419)],
             output: PortId(420),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22112, 22188),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(358),
-            target: TransformTarget::Callable(DeclarationId(880)),
+            target: TransformTarget::Callable(DeclarationId(936)),
             inputs: vec![PortId(420)],
             output: PortId(421),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22097, 22189),
@@ -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(1692)),
+            target: TransformTarget::Callable(DeclarationId(1818)),
             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(1693)),
+            target: TransformTarget::Callable(DeclarationId(1819)),
             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(1694)),
+            target: TransformTarget::Callable(DeclarationId(1820)),
             inputs: vec![],
             output: PortId(430),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610),
@@ -4032,7 +4032,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(369),
-            target: TransformTarget::Callable(DeclarationId(876)),
+            target: TransformTarget::Callable(DeclarationId(932)),
             inputs: vec![PortId(432)],
             output: PortId(433),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22641, 22671),
@@ -4048,7 +4048,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(371),
-            target: TransformTarget::Callable(DeclarationId(872)),
+            target: TransformTarget::Callable(DeclarationId(928)),
             inputs: vec![PortId(434)],
             output: PortId(435),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22685, 22717),
@@ -4073,14 +4073,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(374),
-            target: TransformTarget::Callable(DeclarationId(872)),
+            target: TransformTarget::Callable(DeclarationId(928)),
             inputs: vec![PortId(437)],
             output: PortId(438),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22756, 22788),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(375),
-            target: TransformTarget::Callable(DeclarationId(1695)),
+            target: TransformTarget::Callable(DeclarationId(1821)),
             inputs: vec![PortId(436), PortId(438)],
             output: PortId(439),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789),
@@ -4162,7 +4162,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(380),
-            target: TransformTarget::Callable(DeclarationId(874)),
+            target: TransformTarget::Callable(DeclarationId(930)),
             inputs: vec![PortId(443)],
             output: PortId(444),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23093, 23108),
@@ -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(1663)),
+            target: TransformTarget::Callable(DeclarationId(1789)),
             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(1696)),
+            target: TransformTarget::Callable(DeclarationId(1822)),
             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(1697)),
+            target: TransformTarget::Callable(DeclarationId(1823)),
             inputs: vec![PortId(446), PortId(447)],
             output: PortId(448),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148),
@@ -4249,7 +4249,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(389),
-            target: TransformTarget::Callable(DeclarationId(876)),
+            target: TransformTarget::Callable(DeclarationId(932)),
             inputs: vec![PortId(453)],
             output: PortId(454),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23272, 23302),
@@ -4265,7 +4265,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(391),
-            target: TransformTarget::Callable(DeclarationId(874)),
+            target: TransformTarget::Callable(DeclarationId(930)),
             inputs: vec![PortId(455)],
             output: PortId(456),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23306, 23328),
@@ -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(1698)),
+            target: TransformTarget::Callable(DeclarationId(1824)),
             inputs: vec![],
             output: PortId(461),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604),
@@ -4343,7 +4343,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(398),
-            target: TransformTarget::Callable(DeclarationId(877)),
+            target: TransformTarget::Callable(DeclarationId(933)),
             inputs: vec![PortId(463)],
             output: PortId(464),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23635, 23664),
@@ -4359,7 +4359,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(400),
-            target: TransformTarget::Callable(DeclarationId(875)),
+            target: TransformTarget::Callable(DeclarationId(931)),
             inputs: vec![PortId(465)],
             output: PortId(466),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23678, 23715),
@@ -4384,14 +4384,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(403),
-            target: TransformTarget::Callable(DeclarationId(875)),
+            target: TransformTarget::Callable(DeclarationId(931)),
             inputs: vec![PortId(468)],
             output: PortId(469),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23754, 23791),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(404),
-            target: TransformTarget::Callable(DeclarationId(1699)),
+            target: TransformTarget::Callable(DeclarationId(1825)),
             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(1663)),
+            target: TransformTarget::Callable(DeclarationId(1789)),
             inputs: vec![PortId(509)],
             output: PortId(510),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25180, 25195),
@@ -4839,21 +4839,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(435),
-            target: TransformTarget::Callable(DeclarationId(1700)),
+            target: TransformTarget::Callable(DeclarationId(1826)),
             inputs: vec![PortId(515), PortId(516)],
             output: PortId(517),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(436),
-            target: TransformTarget::Callable(DeclarationId(890)),
+            target: TransformTarget::Callable(DeclarationId(946)),
             inputs: vec![PortId(517)],
             output: PortId(518),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25302, 25350),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(437),
-            target: TransformTarget::Callable(DeclarationId(879)),
+            target: TransformTarget::Callable(DeclarationId(935)),
             inputs: vec![PortId(518)],
             output: PortId(519),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25293, 25351),
@@ -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(1663)),
+            target: TransformTarget::Callable(DeclarationId(1789)),
             inputs: vec![PortId(523)],
             output: PortId(524),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25451, 25466),
@@ -4988,14 +4988,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(448),
-            target: TransformTarget::Callable(DeclarationId(855)),
+            target: TransformTarget::Callable(DeclarationId(911)),
             inputs: vec![PortId(529), PortId(530), PortId(531)],
             output: PortId(532),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25577, 25627),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(449),
-            target: TransformTarget::Callable(DeclarationId(1669)),
+            target: TransformTarget::Callable(DeclarationId(1795)),
             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(1663)),
+            target: TransformTarget::Callable(DeclarationId(1789)),
             inputs: vec![PortId(537)],
             output: PortId(538),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25917, 25932),
@@ -5130,7 +5130,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(460),
-            target: TransformTarget::Callable(DeclarationId(881)),
+            target: TransformTarget::Callable(DeclarationId(937)),
             inputs: vec![PortId(544), PortId(545)],
             output: PortId(546),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26086, 26135),
@@ -5164,14 +5164,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(464),
-            target: TransformTarget::Callable(DeclarationId(855)),
+            target: TransformTarget::Callable(DeclarationId(911)),
             inputs: vec![PortId(548), PortId(549), PortId(550)],
             output: PortId(551),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26171, 26221),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(465),
-            target: TransformTarget::Callable(DeclarationId(1667)),
+            target: TransformTarget::Callable(DeclarationId(1793)),
             inputs: vec![PortId(551)],
             output: PortId(552),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26159, 26222),
@@ -5277,49 +5277,49 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(470),
-            target: TransformTarget::Callable(DeclarationId(882)),
+            target: TransformTarget::Callable(DeclarationId(938)),
             inputs: vec![PortId(558), PortId(556), PortId(557)],
             output: PortId(559),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26523, 26552),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(471),
-            target: TransformTarget::Callable(DeclarationId(885)),
+            target: TransformTarget::Callable(DeclarationId(941)),
             inputs: vec![PortId(556), PortId(557)],
             output: PortId(561),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26576, 26594),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(472),
-            target: TransformTarget::Callable(DeclarationId(885)),
+            target: TransformTarget::Callable(DeclarationId(941)),
             inputs: vec![PortId(556), PortId(557)],
             output: PortId(563),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26620, 26638),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(473),
-            target: TransformTarget::Callable(DeclarationId(885)),
+            target: TransformTarget::Callable(DeclarationId(941)),
             inputs: vec![PortId(556), PortId(557)],
             output: PortId(565),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26657, 26675),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(474),
-            target: TransformTarget::Callable(DeclarationId(885)),
+            target: TransformTarget::Callable(DeclarationId(941)),
             inputs: vec![PortId(556), PortId(557)],
             output: PortId(567),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26694, 26712),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(475),
-            target: TransformTarget::Callable(DeclarationId(885)),
+            target: TransformTarget::Callable(DeclarationId(941)),
             inputs: vec![PortId(556), PortId(557)],
             output: PortId(569),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26735, 26753),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(476),
-            target: TransformTarget::Callable(DeclarationId(885)),
+            target: TransformTarget::Callable(DeclarationId(941)),
             inputs: vec![PortId(556), PortId(557)],
             output: PortId(571),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26776, 26794),
@@ -5428,49 +5428,49 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(479),
-            target: TransformTarget::Callable(DeclarationId(883)),
+            target: TransformTarget::Callable(DeclarationId(939)),
             inputs: vec![PortId(573), PortId(576), PortId(574), PortId(575)],
             output: PortId(577),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26927, 26963),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(480),
-            target: TransformTarget::Callable(DeclarationId(885)),
+            target: TransformTarget::Callable(DeclarationId(941)),
             inputs: vec![PortId(574), PortId(575)],
             output: PortId(579),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26987, 27005),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(481),
-            target: TransformTarget::Callable(DeclarationId(885)),
+            target: TransformTarget::Callable(DeclarationId(941)),
             inputs: vec![PortId(574), PortId(575)],
             output: PortId(581),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27031, 27049),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(482),
-            target: TransformTarget::Callable(DeclarationId(885)),
+            target: TransformTarget::Callable(DeclarationId(941)),
             inputs: vec![PortId(574), PortId(575)],
             output: PortId(583),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27068, 27086),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(483),
-            target: TransformTarget::Callable(DeclarationId(885)),
+            target: TransformTarget::Callable(DeclarationId(941)),
             inputs: vec![PortId(574), PortId(575)],
             output: PortId(585),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27105, 27123),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(484),
-            target: TransformTarget::Callable(DeclarationId(885)),
+            target: TransformTarget::Callable(DeclarationId(941)),
             inputs: vec![PortId(574), PortId(575)],
             output: PortId(587),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27146, 27164),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(485),
-            target: TransformTarget::Callable(DeclarationId(885)),
+            target: TransformTarget::Callable(DeclarationId(941)),
             inputs: vec![PortId(574), PortId(575)],
             output: PortId(589),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27187, 27205),
@@ -5579,21 +5579,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(488),
-            target: TransformTarget::Callable(DeclarationId(864)),
+            target: TransformTarget::Callable(DeclarationId(920)),
             inputs: vec![PortId(591), PortId(592)],
             output: PortId(595),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27340, 27366),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(489),
-            target: TransformTarget::Callable(DeclarationId(884)),
+            target: TransformTarget::Callable(DeclarationId(940)),
             inputs: vec![PortId(591)],
             output: PortId(596),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27376, 27397),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(490),
-            target: TransformTarget::Callable(DeclarationId(885)),
+            target: TransformTarget::Callable(DeclarationId(941)),
             inputs: vec![PortId(593), PortId(594)],
             output: PortId(597),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27409, 27427),
@@ -5636,14 +5636,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(493),
-            target: TransformTarget::Callable(DeclarationId(854)),
+            target: TransformTarget::Callable(DeclarationId(910)),
             inputs: vec![PortId(599), PortId(600)],
             output: PortId(601),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27617, 27632),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(494),
-            target: TransformTarget::Callable(DeclarationId(1667)),
+            target: TransformTarget::Callable(DeclarationId(1793)),
             inputs: vec![PortId(601)],
             output: PortId(602),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27605, 27633),
@@ -5677,7 +5677,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(498),
-            target: TransformTarget::Callable(DeclarationId(863)),
+            target: TransformTarget::Callable(DeclarationId(919)),
             inputs: vec![PortId(604), PortId(606)],
             output: PortId(607),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27740, 27763),
@@ -5700,7 +5700,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(501),
-            target: TransformTarget::Callable(DeclarationId(850)),
+            target: TransformTarget::Callable(DeclarationId(906)),
             inputs: vec![PortId(608), PortId(609)],
             output: PortId(610),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27720, 27784),
@@ -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(1701)),
+            target: TransformTarget::Callable(DeclarationId(1827)),
             inputs: vec![],
             output: PortId(615),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995),
@@ -5750,7 +5750,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(507),
-            target: TransformTarget::Callable(DeclarationId(863)),
+            target: TransformTarget::Callable(DeclarationId(919)),
             inputs: vec![PortId(614), PortId(617)],
             output: PortId(618),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28026, 28057),
@@ -5766,7 +5766,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(509),
-            target: TransformTarget::Callable(DeclarationId(888)),
+            target: TransformTarget::Callable(DeclarationId(944)),
             inputs: vec![PortId(619), PortId(614)],
             output: PortId(620),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28071, 28116),
@@ -5791,14 +5791,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(512),
-            target: TransformTarget::Callable(DeclarationId(888)),
+            target: TransformTarget::Callable(DeclarationId(944)),
             inputs: vec![PortId(622), PortId(614)],
             output: PortId(623),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28155, 28200),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(513),
-            target: TransformTarget::Callable(DeclarationId(1702)),
+            target: TransformTarget::Callable(DeclarationId(1828)),
             inputs: vec![PortId(621), PortId(623)],
             output: PortId(624),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201),
@@ -5880,35 +5880,35 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(518),
-            target: TransformTarget::Callable(DeclarationId(851)),
+            target: TransformTarget::Callable(DeclarationId(907)),
             inputs: vec![PortId(629)],
             output: PortId(630),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28329, 28353),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(519),
-            target: TransformTarget::Callable(DeclarationId(1704)),
+            target: TransformTarget::Callable(DeclarationId(1830)),
             inputs: vec![PortId(628), PortId(630)],
             output: PortId(631),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(520),
-            target: TransformTarget::Callable(DeclarationId(887)),
+            target: TransformTarget::Callable(DeclarationId(943)),
             inputs: vec![PortId(631)],
             output: PortId(632),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28310, 28378),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(521),
-            target: TransformTarget::Callable(DeclarationId(888)),
+            target: TransformTarget::Callable(DeclarationId(944)),
             inputs: vec![PortId(628), PortId(629)],
             output: PortId(633),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28414, 28448),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(522),
-            target: TransformTarget::Callable(DeclarationId(1705)),
+            target: TransformTarget::Callable(DeclarationId(1831)),
             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(1706)),
+            target: TransformTarget::Callable(DeclarationId(1832)),
             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(1708)),
+            target: TransformTarget::Callable(DeclarationId(1834)),
             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(1663)),
+            target: TransformTarget::Callable(DeclarationId(1789)),
             inputs: vec![PortId(640)],
             output: PortId(641),
             span: SourceSpan::new("src/v3/std/induction.dag", 29099, 29114),
@@ -5997,7 +5997,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(531),
-            target: TransformTarget::Callable(DeclarationId(1089)),
+            target: TransformTarget::Callable(DeclarationId(1168)),
             inputs: vec![PortId(643)],
             output: PortId(644),
             span: SourceSpan::new("src/v3/std/induction.dag", 29146, 29172),
@@ -6013,7 +6013,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(533),
-            target: TransformTarget::Callable(DeclarationId(1090)),
+            target: TransformTarget::Callable(DeclarationId(1169)),
             inputs: vec![PortId(646)],
             output: PortId(647),
             span: SourceSpan::new("src/v3/std/induction.dag", 29209, 29238),
@@ -6029,7 +6029,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(535),
-            target: TransformTarget::Callable(DeclarationId(1092)),
+            target: TransformTarget::Callable(DeclarationId(1171)),
             inputs: vec![PortId(649)],
             output: PortId(650),
             span: SourceSpan::new("src/v3/std/induction.dag", 29279, 29307),
@@ -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(1671)),
+            target: TransformTarget::Callable(DeclarationId(1797)),
             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(1671)),
+            target: TransformTarget::Callable(DeclarationId(1797)),
             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(1671)),
+            target: TransformTarget::Callable(DeclarationId(1797)),
             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(1671)),
+            target: TransformTarget::Callable(DeclarationId(1797)),
             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(1671)),
+            target: TransformTarget::Callable(DeclarationId(1797)),
             inputs: vec![PortId(668)],
             output: PortId(669),
             span: SourceSpan::new("src/v3/std/induction.dag", 29761, 29835),
@@ -6283,7 +6283,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(554),
-            target: TransformTarget::Callable(DeclarationId(1090)),
+            target: TransformTarget::Callable(DeclarationId(1169)),
             inputs: vec![PortId(671)],
             output: PortId(672),
             span: SourceSpan::new("src/v3/std/induction.dag", 30026, 30060),
@@ -6299,171 +6299,163 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(556),
-            target: TransformTarget::Callable(DeclarationId(1234)),
-            inputs: vec![],
-            output: PortId(676),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3147, 3175),
+            target: TransformTarget::ResolvedFieldProject {
+                field_label: "nodes".to_string(),
+            },
+            inputs: vec![PortId(673)],
+            output: PortId(674),
+            span: SourceSpan::new("src/v3/std/workflows.dag", 1013, 1018),
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Bind(BindNode {
             id: NodeId(557),
-            target: TransformTarget::Callable(DeclarationId(1243)),
-            inputs: vec![PortId(673), PortId(676)],
-            output: PortId(677),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3123, 3176),
+            name: "behavior_spine".to_string(),
+            value: PortId(674),
+            params: vec![PortId(673)],
+            span: SourceSpan::new("src/v3/std/workflows.dag", 1011, 1018),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Value(ValueNode {
             id: NodeId(558),
-            target: TransformTarget::Callable(DeclarationId(1234)),
-            inputs: vec![],
-            output: PortId(678),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3212, 3240),
+            data: LiteralBits::String("src/v3/std/timing_lens.dag".to_string()),
+            output: PortId(675),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 1570, 1598),
+            lane2_workflow: None,
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Bind(BindNode {
             id: NodeId(559),
-            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),
+            name: "timing_lens_module_path_witness".to_string(),
+            value: PortId(675),
+            params: vec![],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 1570, 1598),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(560),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "value".to_string(),
-            },
-            inputs: vec![PortId(680)],
+            target: TransformTarget::Callable(DeclarationId(1216)),
+            inputs: vec![
+                PortId(676),
+                PortId(677),
+                PortId(678),
+                PortId(679),
+                PortId(680),
+            ],
             output: PortId(681),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3267, 3275),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7430, 7573),
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Bind(BindNode {
             id: NodeId(561),
-            target: TransformTarget::Callable(DeclarationId(1234)),
-            inputs: vec![],
-            output: PortId(682),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3290, 3318),
+            name: "gate_62_file_attachment_demo_record".to_string(),
+            value: PortId(681),
+            params: vec![
+                PortId(676),
+                PortId(677),
+                PortId(678),
+                PortId(679),
+                PortId(680),
+            ],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7430, 7573),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(562),
-            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),
+            target: TransformTarget::Callable(DeclarationId(2193)),
+            inputs: vec![],
+            output: PortId(682),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9624, 9634),
         }));
-        nodes.push(Behavior::Branch(BranchNode {
+        nodes.push(Behavior::Bind(BindNode {
             id: NodeId(563),
-            input: PortId(677),
-            paths: vec![
-                Path {
-                    body: NodeId(559),
-                    output: PortId(679),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "NoDiagnostic".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            3187,
-                            3199,
-                        ),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(562),
-                    output: PortId(683),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "SomeDiagnostic".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            3250,
-                            3277,
-                        ),
-                    },
-                    binding: Some(PayloadBinding {
-                        binding_name: "_".to_string(),
-                        payload_port: PortId(680),
-                    }),
-                },
-            ],
-            output: PortId(684),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3117, 3327),
-            emit_participation: Some(BranchEmitParticipation::UserMatch),
+            name: "timing_measurement_unobserved".to_string(),
+            value: PortId(682),
+            params: vec![],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9624, 9634),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(564),
-            target: TransformTarget::Callable(DeclarationId(1234)),
+            target: TransformTarget::Callable(DeclarationId(2193)),
             inputs: vec![],
             output: PortId(686),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3384, 3412),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9942, 9952),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(565),
-            target: TransformTarget::Callable(DeclarationId(1243)),
-            inputs: vec![PortId(673), PortId(686)],
+            target: TransformTarget::Callable(DeclarationId(2193)),
+            inputs: vec![],
             output: PortId(687),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3360, 3413),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10004, 10014),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(566),
-            target: TransformTarget::Callable(DeclarationId(1234)),
+            target: TransformTarget::Callable(DeclarationId(2195)),
             inputs: vec![],
             output: PortId(688),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3449, 3477),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10032, 10037),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(567),
-            target: TransformTarget::Callable(DeclarationId(2076)),
-            inputs: vec![PortId(688)],
+            target: TransformTarget::Callable(DeclarationId(2195)),
+            inputs: vec![],
             output: PortId(689),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3440, 3478),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10059, 10064),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(568),
             target: TransformTarget::UnresolvedFieldProject {
-                field_label: "value".to_string(),
+                field_label: "duration".to_string(),
             },
             inputs: vec![PortId(690)],
             output: PortId(691),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3504, 3512),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10084, 10095),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(569),
-            target: TransformTarget::Callable(DeclarationId(1234)),
+            target: TransformTarget::Callable(DeclarationId(2195)),
             inputs: vec![],
             output: PortId(692),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3527, 3555),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(570),
-            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),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10101, 10106),
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(571),
-            input: PortId(687),
+            id: NodeId(570),
+            input: PortId(684),
             paths: vec![
+                Path {
+                    body: NodeId(565),
+                    output: PortId(687),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Unobserved".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 9990, 10000),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(566),
+                    output: PortId(688),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Stale".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10023, 10028),
+                    },
+                    binding: None,
+                },
                 Path {
                     body: NodeId(567),
                     output: PortId(689),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "NoDiagnostic".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            3424,
-                            3436,
-                        ),
+                        name: "Ambiguous".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10046, 10055),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(570),
-                    output: PortId(693),
+                    body: NodeId(569),
+                    output: PortId(692),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "SomeDiagnostic".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            3487,
-                            3514,
-                        ),
+                        name: "Observed".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10073, 10097),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "_".to_string(),
@@ -6471,1522 +6463,1513 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     }),
                 },
             ],
-            output: PortId(694),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3354, 3564),
+            output: PortId(693),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9972, 10114),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(572),
-            target: TransformTarget::Callable(DeclarationId(1234)),
+            id: NodeId(571),
+            target: TransformTarget::Callable(DeclarationId(2193)),
             inputs: vec![],
-            output: PortId(696),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3618, 3646),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(573),
-            target: TransformTarget::Callable(DeclarationId(1243)),
-            inputs: vec![PortId(673), PortId(696)],
-            output: PortId(697),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3594, 3647),
+            output: PortId(694),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10170, 10180),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(574),
-            target: TransformTarget::Callable(DeclarationId(1234)),
+            id: NodeId(572),
+            target: TransformTarget::Callable(DeclarationId(2195)),
             inputs: vec![],
-            output: PortId(698),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3683, 3711),
+            output: PortId(695),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10198, 10203),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(575),
-            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),
+            id: NodeId(573),
+            target: TransformTarget::Callable(DeclarationId(2194)),
+            inputs: vec![],
+            output: PortId(696),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10225, 10234),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(576),
+            id: NodeId(574),
             target: TransformTarget::UnresolvedFieldProject {
-                field_label: "value".to_string(),
+                field_label: "duration".to_string(),
             },
-            inputs: vec![PortId(700)],
-            output: PortId(701),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3738, 3746),
+            inputs: vec![PortId(697)],
+            output: PortId(698),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10254, 10265),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(577),
-            target: TransformTarget::Callable(DeclarationId(1234)),
+            id: NodeId(575),
+            target: TransformTarget::Callable(DeclarationId(2194)),
             inputs: vec![],
-            output: PortId(702),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3761, 3789),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(578),
-            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),
+            output: PortId(699),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10271, 10280),
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(579),
-            input: PortId(697),
+            id: NodeId(576),
+            input: PortId(684),
             paths: vec![
                 Path {
-                    body: NodeId(575),
-                    output: PortId(699),
+                    body: NodeId(571),
+                    output: PortId(694),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "NoDiagnostic".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            3658,
-                            3670,
-                        ),
+                        name: "Unobserved".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10156, 10166),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(578),
-                    output: PortId(703),
+                    body: NodeId(572),
+                    output: PortId(695),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "SomeDiagnostic".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            3721,
-                            3748,
-                        ),
+                        name: "Stale".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10189, 10194),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(573),
+                    output: PortId(696),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Ambiguous".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10212, 10221),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(575),
+                    output: PortId(699),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Observed".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10243, 10267),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "_".to_string(),
-                        payload_port: PortId(700),
+                        payload_port: PortId(697),
                     }),
                 },
             ],
-            output: PortId(704),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3588, 3798),
+            output: PortId(700),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10138, 10288),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(577),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "duration".to_string(),
+            },
+            inputs: vec![PortId(701)],
+            output: PortId(702),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10304, 10316),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(578),
+            target: TransformTarget::Callable(DeclarationId(2193)),
+            inputs: vec![],
+            output: PortId(703),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10360, 10370),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(579),
+            target: TransformTarget::Callable(DeclarationId(2195)),
+            inputs: vec![],
+            output: PortId(704),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10388, 10393),
+        }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(580),
-            target: TransformTarget::Callable(DeclarationId(1234)),
+            target: TransformTarget::Callable(DeclarationId(2194)),
             inputs: vec![],
-            output: PortId(706),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3850, 3878),
+            output: PortId(705),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10415, 10424),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(581),
-            target: TransformTarget::Callable(DeclarationId(1243)),
-            inputs: vec![PortId(673), PortId(706)],
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "duration".to_string(),
+            },
+            inputs: vec![PortId(706)],
             output: PortId(707),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3826, 3879),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10444, 10456),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(582),
-            target: TransformTarget::Callable(DeclarationId(1234)),
-            inputs: vec![],
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "count".to_string(),
+            },
+            inputs: vec![PortId(702)],
             output: PortId(708),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3915, 3943),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10536, 10541),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(583),
-            target: TransformTarget::Callable(DeclarationId(2080)),
-            inputs: vec![PortId(708)],
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "count".to_string(),
+            },
+            inputs: vec![PortId(707)],
             output: PortId(709),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3906, 3944),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10547, 10552),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(584),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "value".to_string(),
-            },
+            target: TransformTarget::Operator(OperatorKind::Arithmetic(ArithmeticOp::Add)),
+            inputs: vec![PortId(708), PortId(709)],
+            output: PortId(710),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10533, 10552),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(585),
+            target: TransformTarget::Callable(DeclarationId(1213)),
             inputs: vec![PortId(710)],
             output: PortId(711),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3970, 3978),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10524, 10554),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(585),
-            target: TransformTarget::Callable(DeclarationId(1234)),
-            inputs: vec![],
+            id: NodeId(586),
+            target: TransformTarget::Callable(DeclarationId(2192)),
+            inputs: vec![PortId(711)],
             output: PortId(712),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3993, 4021),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10503, 10556),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(586),
-            target: TransformTarget::Callable(DeclarationId(2081)),
-            inputs: vec![PortId(712)],
+            id: NodeId(587),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "count".to_string(),
+            },
+            inputs: vec![PortId(702)],
             output: PortId(713),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3984, 4022),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10625, 10630),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(588),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "count".to_string(),
+            },
+            inputs: vec![PortId(707)],
+            output: PortId(714),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10636, 10641),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(589),
+            target: TransformTarget::Operator(OperatorKind::Comparison(ComparisonOp::Gt)),
+            inputs: vec![PortId(713), PortId(714)],
+            output: PortId(715),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10622, 10641),
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(587),
-            input: PortId(707),
+            id: NodeId(590),
+            input: PortId(715),
             paths: vec![
                 Path {
-                    body: NodeId(583),
-                    output: PortId(709),
+                    body: NodeId(577),
+                    output: PortId(702),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "NoDiagnostic".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            3890,
-                            3902,
-                        ),
+                        name: "True".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10647, 10649),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(586),
-                    output: PortId(713),
+                    body: NodeId(581),
+                    output: PortId(707),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "SomeDiagnostic".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            3953,
-                            3980,
-                        ),
+                        name: "False".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10655, 10657),
                     },
-                    binding: Some(PayloadBinding {
-                        binding_name: "_".to_string(),
-                        payload_port: PortId(710),
-                    }),
+                    binding: None,
                 },
             ],
-            output: PortId(714),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3820, 4030),
-            emit_participation: Some(BranchEmitParticipation::UserMatch),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(588),
-            target: TransformTarget::Callable(DeclarationId(1234)),
-            inputs: vec![],
             output: PortId(716),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4082, 4110),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(589),
-            target: TransformTarget::Callable(DeclarationId(1243)),
-            inputs: vec![PortId(673), PortId(716)],
-            output: PortId(717),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4058, 4111),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(590),
-            target: TransformTarget::Callable(DeclarationId(1234)),
-            inputs: vec![],
-            output: PortId(718),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4147, 4175),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10619, 10657),
+            emit_participation: None,
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(591),
-            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),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(592),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "value".to_string(),
-            },
-            inputs: vec![PortId(720)],
-            output: PortId(721),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4202, 4210),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(593),
-            target: TransformTarget::Callable(DeclarationId(1234)),
-            inputs: vec![],
-            output: PortId(722),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4225, 4253),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(594),
-            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),
+            target: TransformTarget::Callable(DeclarationId(2192)),
+            inputs: vec![PortId(716)],
+            output: PortId(717),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10584, 10672),
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(595),
-            input: PortId(717),
+            id: NodeId(592),
+            input: PortId(685),
             paths: vec![
                 Path {
-                    body: NodeId(591),
-                    output: PortId(719),
+                    body: NodeId(586),
+                    output: PortId(712),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "NoDiagnostic".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            4122,
-                            4134,
-                        ),
+                        name: "True".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10503, 10556),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(594),
-                    output: PortId(723),
+                    body: NodeId(591),
+                    output: PortId(717),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "SomeDiagnostic".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            4185,
-                            4212,
-                        ),
+                        name: "False".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10584, 10672),
                     },
-                    binding: Some(PayloadBinding {
-                        binding_name: "_".to_string(),
-                        payload_port: PortId(720),
-                    }),
+                    binding: None,
                 },
             ],
-            output: PortId(724),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4052, 4262),
-            emit_participation: Some(BranchEmitParticipation::UserMatch),
+            output: PortId(718),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10472, 10672),
+            emit_participation: None,
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(596),
-            input: PortId(674),
+            id: NodeId(593),
+            input: PortId(684),
             paths: vec![
                 Path {
-                    body: NodeId(563),
-                    output: PortId(684),
+                    body: NodeId(578),
+                    output: PortId(703),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Value".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            3099,
-                            3107,
-                        ),
+                        name: "Unobserved".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10346, 10356),
                     },
-                    binding: Some(PayloadBinding {
-                        binding_name: "_".to_string(),
-                        payload_port: PortId(675),
-                    }),
+                    binding: None,
                 },
                 Path {
-                    body: NodeId(571),
-                    output: PortId(694),
+                    body: NodeId(579),
+                    output: PortId(704),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Transform".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            3332,
-                            3344,
-                        ),
+                        name: "Stale".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10379, 10384),
                     },
-                    binding: Some(PayloadBinding {
-                        binding_name: "_".to_string(),
-                        payload_port: PortId(685),
-                    }),
+                    binding: None,
                 },
                 Path {
-                    body: NodeId(579),
-                    output: PortId(704),
+                    body: NodeId(580),
+                    output: PortId(705),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Branch".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            3569,
-                            3578,
-                        ),
+                        name: "Ambiguous".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10402, 10411),
                     },
-                    binding: Some(PayloadBinding {
-                        binding_name: "_".to_string(),
-                        payload_port: PortId(695),
-                    }),
+                    binding: None,
                 },
                 Path {
-                    body: NodeId(587),
-                    output: PortId(714),
+                    body: NodeId(592),
+                    output: PortId(718),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Loop".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            3803,
-                            3810,
-                        ),
+                        name: "Observed".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10433, 10458),
                     },
                     binding: Some(PayloadBinding {
-                        binding_name: "_".to_string(),
-                        payload_port: PortId(705),
+                        binding_name: "bx".to_string(),
+                        payload_port: PortId(706),
                     }),
                 },
+            ],
+            output: PortId(719),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10328, 10680),
+            emit_participation: Some(BranchEmitParticipation::UserMatch),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(594),
+            input: PortId(683),
+            paths: vec![
                 Path {
-                    body: NodeId(595),
-                    output: PortId(724),
+                    body: NodeId(564),
+                    output: PortId(686),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Bind".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            4035,
-                            4042,
-                        ),
+                        name: "Unobserved".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 9928, 9938),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(570),
+                    output: PortId(693),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Stale".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 9957, 9962),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(576),
+                    output: PortId(700),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Ambiguous".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10119, 10128),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(593),
+                    output: PortId(719),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Observed".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10293, 10318),
                     },
                     binding: Some(PayloadBinding {
-                        binding_name: "_".to_string(),
-                        payload_port: PortId(715),
+                        binding_name: "ax".to_string(),
+                        payload_port: PortId(701),
                     }),
                 },
             ],
-            output: PortId(725),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3085, 4266),
+            output: PortId(720),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9914, 10684),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(597),
-            name: "ci_demo_timing_read".to_string(),
-            value: PortId(725),
-            params: vec![PortId(673), PortId(674)],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3085, 4266),
+            id: NodeId(595),
+            name: "timing_measurement_lens_combine".to_string(),
+            value: PortId(720),
+            params: vec![PortId(683), PortId(684), PortId(685)],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9914, 10684),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
+        nodes.push(Behavior::Value(ValueNode {
+            id: NodeId(596),
+            data: LiteralBits::Bool(true),
+            output: PortId(723),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10890, 10894),
+            lane2_workflow: None,
+        }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(598),
-            target: TransformTarget::Callable(DeclarationId(1180)),
-            inputs: vec![PortId(726), PortId(727)],
-            output: PortId(728),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4657, 4682),
+            id: NodeId(597),
+            target: TransformTarget::Callable(DeclarationId(1224)),
+            inputs: vec![PortId(721), PortId(722), PortId(723)],
+            output: PortId(724),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10852, 10895),
         }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(599),
-            name: "ci_wad_modeled_workflow_timing_witness".to_string(),
-            value: PortId(728),
-            params: vec![PortId(726), PortId(727)],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4657, 4682),
+            id: NodeId(598),
+            name: "timing_sequential_op".to_string(),
+            value: PortId(724),
+            params: vec![PortId(721), PortId(722)],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10852, 10895),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
+        nodes.push(Behavior::Value(ValueNode {
+            id: NodeId(599),
+            data: LiteralBits::Int("0".to_string()),
+            output: PortId(725),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10947, 10948),
+            lane2_workflow: None,
+        }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(600),
-            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),
+            target: TransformTarget::Callable(DeclarationId(1213)),
+            inputs: vec![PortId(725)],
+            output: PortId(726),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10938, 10950),
         }));
         nodes.push(Behavior::Bind(BindNode {
             id: NodeId(601),
-            name: "_ci_wad_seed_list_declaration_empty".to_string(),
-            value: PortId(729),
+            name: "nanoseconds_zero".to_string(),
+            value: PortId(726),
             params: vec![],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4940, 4945),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10938, 10950),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(602),
-            target: TransformTarget::Callable(DeclarationId(2085)),
+            target: TransformTarget::Callable(DeclarationId(1226)),
             inputs: vec![],
-            output: PortId(730),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5005, 5010),
+            output: PortId(727),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11030, 11048),
         }));
-        nodes.push(Behavior::Bind(BindNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(603),
-            name: "_ci_wad_seed_list_behavior_empty".to_string(),
-            value: PortId(730),
+            target: TransformTarget::Callable(DeclarationId(2192)),
+            inputs: vec![PortId(727)],
+            output: PortId(728),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11009, 11050),
+        }));
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(604),
+            name: "timing_sequential_identity".to_string(),
+            value: PortId(728),
             params: vec![],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5005, 5010),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11009, 11050),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(604),
-            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),
-        }));
-        nodes.push(Behavior::Bind(BindNode {
+        nodes.push(Behavior::Value(ValueNode {
             id: NodeId(605),
-            name: "_ci_wad_seed_list_dagport_empty".to_string(),
-            value: PortId(731),
-            params: vec![],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5068, 5073),
+            data: LiteralBits::Bool(false),
+            output: PortId(731),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11237, 11242),
             lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(606),
-            target: TransformTarget::Callable(DeclarationId(2087)),
-            inputs: vec![],
+            target: TransformTarget::Callable(DeclarationId(1224)),
+            inputs: vec![PortId(729), PortId(730), PortId(731)],
             output: PortId(732),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5131, 5136),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11199, 11243),
         }));
         nodes.push(Behavior::Bind(BindNode {
             id: NodeId(607),
-            name: "_ci_wad_seed_list_cluster_empty".to_string(),
+            name: "timing_branch_op".to_string(),
             value: PortId(732),
-            params: vec![],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5131, 5136),
+            params: vec![PortId(729), PortId(730)],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11199, 11243),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(608),
-            target: TransformTarget::Callable(DeclarationId(2088)),
+            target: TransformTarget::Callable(DeclarationId(2202)),
             inputs: vec![],
             output: PortId(733),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5195, 5200),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11304, 11309),
         }));
         nodes.push(Behavior::Bind(BindNode {
             id: NodeId(609),
-            name: "_ci_wad_empty_list_diagnostic".to_string(),
+            name: "timing_lens_empty_corrections".to_string(),
             value: PortId(733),
             params: vec![],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5195, 5200),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11304, 11309),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(610),
-            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),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "span".to_string(),
+            },
+            inputs: vec![PortId(735)],
+            output: PortId(736),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11580, 11584),
         }));
-        nodes.push(Behavior::Bind(BindNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(611),
-            name: "_ci_wad_empty_list_witness_tm".to_string(),
-            value: PortId(734),
-            params: vec![],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5275, 5280),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "span".to_string(),
+            },
+            inputs: vec![PortId(737)],
+            output: PortId(738),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11607, 11611),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(612),
-            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),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "span".to_string(),
+            },
+            inputs: vec![PortId(739)],
+            output: PortId(740),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11633, 11637),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(613),
-            target: TransformTarget::Callable(DeclarationId(1187)),
-            inputs: vec![],
-            output: PortId(737),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5410, 5441),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "span".to_string(),
+            },
+            inputs: vec![PortId(741)],
+            output: PortId(742),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11655, 11659),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(614),
-            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),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "span".to_string(),
+            },
+            inputs: vec![PortId(743)],
+            output: PortId(744),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11683, 11687),
         }));
-        nodes.push(Behavior::Bind(BindNode {
+        nodes.push(Behavior::Branch(BranchNode {
             id: NodeId(615),
-            name: "_ci_wad_witnesses_singleton_tm".to_string(),
-            value: PortId(738),
-            params: vec![PortId(735)],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5378, 5443),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
+            input: PortId(734),
+            paths: vec![
+                Path {
+                    body: NodeId(610),
+                    output: PortId(736),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Value".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 11566, 11574),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "v".to_string(),
+                        payload_port: PortId(735),
+                    }),
+                },
+                Path {
+                    body: NodeId(611),
+                    output: PortId(738),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Transform".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 11589, 11601),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "t".to_string(),
+                        payload_port: PortId(737),
+                    }),
+                },
+                Path {
+                    body: NodeId(612),
+                    output: PortId(740),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Branch".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 11616, 11626),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "br".to_string(),
+                        payload_port: PortId(739),
+                    }),
+                },
+                Path {
+                    body: NodeId(613),
+                    output: PortId(742),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Loop".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 11642, 11649),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "l".to_string(),
+                        payload_port: PortId(741),
+                    }),
+                },
+                Path {
+                    body: NodeId(614),
+                    output: PortId(744),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Bind".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 11664, 11674),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "bind".to_string(),
+                        payload_port: PortId(743),
+                    }),
+                },
+            ],
+            output: PortId(745),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11552, 11691),
+            emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Bind(BindNode {
             id: NodeId(616),
-            target: TransformTarget::Callable(DeclarationId(1186)),
-            inputs: vec![],
-            output: PortId(740),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5544, 5575),
+            name: "timing_lens_behavior_span".to_string(),
+            value: PortId(745),
+            params: vec![PortId(734)],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11552, 11691),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(617),
-            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),
+            target: TransformTarget::Callable(DeclarationId(1951)),
+            inputs: vec![],
+            output: PortId(748),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12059, 12071),
         }));
-        nodes.push(Behavior::Bind(BindNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(618),
-            name: "_ci_wad_violations_singleton".to_string(),
-            value: PortId(741),
-            params: vec![PortId(739)],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5519, 5577),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
+            target: TransformTarget::Callable(DeclarationId(1957)),
+            inputs: vec![PortId(748)],
+            output: PortId(749),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12046, 12072),
         }));
-        nodes.push(Behavior::Value(ValueNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(619),
-            data: LiteralBits::String("ci_modeled_timing".to_string()),
-            output: PortId(743),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5712, 5731),
-            lane2_workflow: None,
+            target: TransformTarget::Callable(DeclarationId(1229)),
+            inputs: vec![],
+            output: PortId(750),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12115, 12146),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(620),
-            target: TransformTarget::Callable(DeclarationId(1188)),
-            inputs: vec![PortId(742)],
-            output: PortId(744),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5765, 5798),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(621),
-            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),
+            target: TransformTarget::Callable(DeclarationId(1039)),
+            inputs: vec![PortId(749), PortId(747), PortId(746), PortId(750)],
+            output: PortId(751),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12034, 12150),
         }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(622),
-            name: "_ci_wad_dimension_ok_tm_payload".to_string(),
-            value: PortId(745),
-            params: vec![PortId(742)],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5678, 5803),
+            id: NodeId(621),
+            name: "timing_lens_scaffold_non_evidence_diagnostic".to_string(),
+            value: PortId(751),
+            params: vec![PortId(746), PortId(747)],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12034, 12150),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(622),
+            target: TransformTarget::Callable(DeclarationId(1212)),
+            inputs: vec![],
+            output: PortId(752),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12457, 12490),
+        }));
         nodes.push(Behavior::Value(ValueNode {
             id: NodeId(623),
-            data: LiteralBits::String("ci_modeled_timing".to_string()),
-            output: PortId(748),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5960, 5979),
+            data: LiteralBits::Int("0".to_string()),
+            output: PortId(753),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12502, 12503),
             lane2_workflow: None,
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Value(ValueNode {
             id: NodeId(624),
-            target: TransformTarget::Callable(DeclarationId(1189)),
-            inputs: vec![PortId(747)],
-            output: PortId(749),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5997, 6031),
+            data: LiteralBits::Int("0".to_string()),
+            output: PortId(754),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12513, 12514),
+            lane2_workflow: None,
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(625),
-            target: TransformTarget::Callable(DeclarationId(1188)),
-            inputs: vec![PortId(746)],
-            output: PortId(750),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6048, 6081),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(626),
-            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),
+            target: TransformTarget::Callable(DeclarationId(159)),
+            inputs: vec![PortId(752), PortId(753), PortId(754)],
+            output: PortId(755),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12445, 12518),
         }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(627),
-            name: "_ci_wad_dimension_fail_tm_payload".to_string(),
-            value: PortId(751),
-            params: vec![PortId(746), PortId(747)],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5924, 6086),
+            id: NodeId(626),
+            name: "timing_lens_degenerate_empty_dag_span".to_string(),
+            value: PortId(755),
+            params: vec![],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12445, 12518),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(627),
+            target: TransformTarget::Callable(DeclarationId(1211)),
+            inputs: vec![PortId(756)],
+            output: PortId(758),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13071, 13088),
+        }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(628),
-            target: TransformTarget::Callable(DeclarationId(1293)),
-            inputs: vec![PortId(752)],
-            output: PortId(754),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6449, 6466),
+            target: TransformTarget::ResolvedFieldProject {
+                field_label: "declarations".to_string(),
+            },
+            inputs: vec![PortId(756)],
+            output: PortId(759),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13118, 13130),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(629),
-            target: TransformTarget::Callable(DeclarationId(1190)),
-            inputs: vec![PortId(753)],
-            output: PortId(755),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6482, 6516),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "head".to_string(),
+            },
+            inputs: vec![PortId(760)],
+            output: PortId(761),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13253, 13257),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(630),
             target: TransformTarget::UnresolvedFieldProject {
-                field_label: "head".to_string(),
+                field_label: "span".to_string(),
             },
-            inputs: vec![PortId(756)],
-            output: PortId(757),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6528, 6536),
+            inputs: vec![PortId(761)],
+            output: PortId(762),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13258, 13262),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(631),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "tail".to_string(),
-            },
-            inputs: vec![PortId(756)],
-            output: PortId(758),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6538, 6546),
+            target: TransformTarget::Callable(DeclarationId(1231)),
+            inputs: vec![PortId(757), PortId(762)],
+            output: PortId(763),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13199, 13263),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(632),
-            target: TransformTarget::Callable(DeclarationId(1190)),
-            inputs: vec![PortId(753)],
-            output: PortId(759),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6552, 6586),
+            target: TransformTarget::Callable(DeclarationId(1985)),
+            inputs: vec![PortId(763)],
+            output: PortId(764),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13163, 13275),
         }));
-        nodes.push(Behavior::Branch(BranchNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(633),
-            input: PortId(754),
+            target: TransformTarget::Callable(DeclarationId(1232)),
+            inputs: vec![],
+            output: PortId(765),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13419, 13458),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(634),
+            target: TransformTarget::Callable(DeclarationId(1231)),
+            inputs: vec![PortId(757), PortId(765)],
+            output: PortId(766),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13339, 13472),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(635),
+            target: TransformTarget::Callable(DeclarationId(1985)),
+            inputs: vec![PortId(766)],
+            output: PortId(767),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13303, 13484),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(636),
+            input: PortId(759),
             paths: vec![
-                Path {
-                    body: NodeId(629),
-                    output: PortId(755),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Empty".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            6473,
-                            6478,
-                        ),
-                    },
-                    binding: None,
-                },
                 Path {
                     body: NodeId(632),
-                    output: PortId(759),
+                    output: PortId(764),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Cons".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            6521,
-                            6548,
-                        ),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 13141, 13149),
                     },
                     binding: Some(PayloadBinding {
-                        binding_name: "__payload_6521_6548".to_string(),
-                        payload_port: PortId(756),
+                        binding_name: "dd".to_string(),
+                        payload_port: PortId(760),
                     }),
                 },
+                Path {
+                    body: NodeId(635),
+                    output: PortId(767),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Empty".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 13284, 13289),
+                    },
+                    binding: None,
+                },
             ],
-            output: PortId(760),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6443, 6590),
+            output: PortId(768),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13110, 13492),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
-        nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(634),
-            name: "report_dim_ok_tm".to_string(),
-            value: PortId(760),
-            params: vec![PortId(752), PortId(753)],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6443, 6590),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(635),
-            target: TransformTarget::Callable(DeclarationId(1293)),
-            inputs: vec![PortId(761)],
-            output: PortId(764),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6710, 6727),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(636),
-            target: TransformTarget::Callable(DeclarationId(1191)),
-            inputs: vec![PortId(762), PortId(763)],
-            output: PortId(765),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6743, 6785),
-        }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(637),
             target: TransformTarget::UnresolvedFieldProject {
                 field_label: "head".to_string(),
             },
-            inputs: vec![PortId(766)],
-            output: PortId(767),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6797, 6805),
+            inputs: vec![PortId(769)],
+            output: PortId(770),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13658, 13662),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(638),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "tail".to_string(),
-            },
-            inputs: vec![PortId(766)],
-            output: PortId(768),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6807, 6815),
+            target: TransformTarget::Callable(DeclarationId(1230)),
+            inputs: vec![PortId(770)],
+            output: PortId(771),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13624, 13663),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(639),
-            target: TransformTarget::Callable(DeclarationId(1191)),
-            inputs: vec![PortId(762), PortId(763)],
-            output: PortId(769),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6821, 6863),
+            target: TransformTarget::Callable(DeclarationId(1231)),
+            inputs: vec![PortId(757), PortId(771)],
+            output: PortId(772),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13552, 13673),
         }));
-        nodes.push(Behavior::Branch(BranchNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(640),
-            input: PortId(764),
+            target: TransformTarget::Callable(DeclarationId(1985)),
+            inputs: vec![PortId(772)],
+            output: PortId(773),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13520, 13681),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(641),
+            input: PortId(758),
             paths: vec![
                 Path {
                     body: NodeId(636),
-                    output: PortId(765),
+                    output: PortId(768),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Empty".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            6734,
-                            6739,
-                        ),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 13095, 13100),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(639),
-                    output: PortId(769),
+                    body: NodeId(640),
+                    output: PortId(773),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Cons".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            6790,
-                            6817,
-                        ),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 13497, 13510),
                     },
                     binding: Some(PayloadBinding {
-                        binding_name: "__payload_6790_6817".to_string(),
-                        payload_port: PortId(766),
+                        binding_name: "payload".to_string(),
+                        payload_port: PortId(769),
                     }),
                 },
             ],
-            output: PortId(770),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6704, 6867),
+            output: PortId(774),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13065, 13685),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(641),
-            name: "report_dim_fail_tm".to_string(),
-            value: PortId(770),
-            params: vec![PortId(761), PortId(762), PortId(763)],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6704, 6867),
+            id: NodeId(642),
+            name: "timing_lens_validate_non_observed".to_string(),
+            value: PortId(774),
+            params: vec![PortId(756), PortId(757)],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13065, 13685),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(642),
-            target: TransformTarget::Callable(DeclarationId(1192)),
-            inputs: vec![PortId(771), PortId(772)],
-            output: PortId(774),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7025, 7047),
-        }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(643),
             target: TransformTarget::UnresolvedFieldProject {
-                field_label: "value".to_string(),
+                field_label: "duration".to_string(),
             },
-            inputs: vec![PortId(775)],
-            output: PortId(776),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7069, 7080),
+            inputs: vec![PortId(777)],
+            output: PortId(778),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14136, 14147),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(644),
-            target: TransformTarget::Callable(DeclarationId(1193)),
-            inputs: vec![PortId(771), PortId(772), PortId(776)],
-            output: PortId(777),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7086, 7116),
+            target: TransformTarget::Callable(DeclarationId(1223)),
+            inputs: vec![],
+            output: PortId(780),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14199, 14230),
         }));
-        nodes.push(Behavior::Branch(BranchNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(645),
-            input: PortId(773),
+            target: TransformTarget::Callable(DeclarationId(1223)),
+            inputs: vec![],
+            output: PortId(782),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14253, 14284),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(646),
+            input: PortId(776),
             paths: vec![
                 Path {
-                    body: NodeId(642),
-                    output: PortId(774),
+                    body: NodeId(644),
+                    output: PortId(780),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "NoDiagnostic".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            7009,
-                            7021,
-                        ),
+                        name: "Cardinality".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14181, 14195),
                     },
-                    binding: None,
+                    binding: Some(PayloadBinding {
+                        binding_name: "_".to_string(),
+                        payload_port: PortId(779),
+                    }),
                 },
                 Path {
-                    body: NodeId(644),
-                    output: PortId(777),
+                    body: NodeId(645),
+                    output: PortId(782),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "SomeDiagnostic".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            7052,
-                            7082,
-                        ),
+                        name: "Descent".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14239, 14249),
                     },
                     binding: Some(PayloadBinding {
-                        binding_name: "diag".to_string(),
-                        payload_port: PortId(775),
+                        binding_name: "_".to_string(),
+                        payload_port: PortId(781),
                     }),
                 },
             ],
-            output: PortId(778),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6994, 7120),
+            output: PortId(783),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14159, 14292),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
-        nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(646),
-            name: "report_inhabits_branch_tm".to_string(),
-            value: PortId(778),
-            params: vec![PortId(771), PortId(772), PortId(773)],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6994, 7120),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
-        }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(647),
-            target: TransformTarget::Callable(DeclarationId(1243)),
-            inputs: vec![PortId(779), PortId(781)],
-            output: PortId(782),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7300, 7326),
+            target: TransformTarget::Callable(DeclarationId(2193)),
+            inputs: vec![],
+            output: PortId(784),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14311, 14321),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(648),
-            target: TransformTarget::Callable(DeclarationId(1194)),
-            inputs: vec![PortId(779), PortId(781), PortId(782)],
-            output: PortId(783),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7268, 7327),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(649),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "reason".to_string(),
-            },
-            inputs: vec![PortId(784)],
+            target: TransformTarget::Callable(DeclarationId(2194)),
+            inputs: vec![],
             output: PortId(785),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7343, 7352),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(650),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "at".to_string(),
-            },
-            inputs: vec![PortId(784)],
-            output: PortId(786),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7354, 7361),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14339, 14348),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(651),
-            target: TransformTarget::Callable(DeclarationId(1234)),
+            id: NodeId(649),
+            target: TransformTarget::Callable(DeclarationId(2195)),
             inputs: vec![],
-            output: PortId(787),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7412, 7440),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(652),
-            target: TransformTarget::Callable(DeclarationId(1237)),
-            inputs: vec![PortId(786)],
-            output: PortId(788),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7498, 7528),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(653),
-            target: TransformTarget::Callable(DeclarationId(1238)),
-            inputs: vec![PortId(785), PortId(788)],
-            output: PortId(789),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7450, 7529),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(654),
-            target: TransformTarget::Callable(DeclarationId(1193)),
-            inputs: vec![PortId(779), PortId(787), PortId(789)],
-            output: PortId(790),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7373, 7537),
+            output: PortId(786),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14362, 14367),
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(655),
-            input: PortId(780),
+            id: NodeId(650),
+            input: PortId(775),
             paths: vec![
                 Path {
-                    body: NodeId(648),
+                    body: NodeId(646),
                     output: PortId(783),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Inhabits".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            7253,
-                            7264,
-                        ),
+                        name: "Observed".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14125, 14149),
                     },
                     binding: Some(PayloadBinding {
-                        binding_name: "c".to_string(),
-                        payload_port: PortId(781),
+                        binding_name: "_".to_string(),
+                        payload_port: PortId(777),
                     }),
                 },
                 Path {
-                    body: NodeId(654),
-                    output: PortId(790),
+                    body: NodeId(647),
+                    output: PortId(784),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Violates".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            7332,
-                            7363,
-                        ),
+                        name: "Unobserved".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14297, 14307),
                     },
-                    binding: Some(PayloadBinding {
-                        binding_name: "__payload_7332_7363".to_string(),
-                        payload_port: PortId(784),
-                    }),
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(648),
+                    output: PortId(785),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Ambiguous".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14326, 14335),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(649),
+                    output: PortId(786),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Stale".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14353, 14358),
+                    },
+                    binding: None,
                 },
             ],
-            output: PortId(791),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7239, 7541),
+            output: PortId(787),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14108, 14371),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(656),
-            name: "dimension_report_tm_from_witness".to_string(),
-            value: PortId(791),
-            params: vec![PortId(779), PortId(780)],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7239, 7541),
+            id: NodeId(651),
+            name: "timing_measurement_iterate".to_string(),
+            value: PortId(787),
+            params: vec![PortId(775), PortId(776)],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14108, 14371),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(657),
-            target: TransformTarget::Callable(DeclarationId(1293)),
-            inputs: vec![PortId(792)],
-            output: PortId(794),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8520, 8537),
+            id: NodeId(652),
+            target: TransformTarget::Callable(DeclarationId(1211)),
+            inputs: vec![PortId(788)],
+            output: PortId(791),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15267, 15284),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(658),
+            id: NodeId(653),
             target: TransformTarget::Callable(DeclarationId(711)),
-            inputs: vec![PortId(794)],
+            inputs: vec![PortId(791)],
+            output: PortId(792),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15258, 15285),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(654),
+            target: TransformTarget::Callable(DeclarationId(1223)),
+            inputs: vec![],
+            output: PortId(793),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15300, 15331),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(655),
+            target: TransformTarget::Callable(DeclarationId(2203)),
+            inputs: vec![PortId(793)],
+            output: PortId(794),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15291, 15332),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(656),
+            target: TransformTarget::Callable(DeclarationId(1223)),
+            inputs: vec![],
             output: PortId(795),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8511, 8538),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15347, 15378),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(659),
-            target: TransformTarget::Callable(DeclarationId(1180)),
-            inputs: vec![PortId(792), PortId(793)],
+            id: NodeId(657),
+            target: TransformTarget::Callable(DeclarationId(2204)),
+            inputs: vec![PortId(795)],
             output: PortId(796),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8584, 8609),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15338, 15379),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(658),
+            input: PortId(792),
+            paths: vec![
+                Path {
+                    body: NodeId(655),
+                    output: PortId(794),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "True".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15291, 15332),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(657),
+                    output: PortId(796),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "False".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15338, 15379),
+                    },
+                    binding: None,
+                },
+            ],
+            output: PortId(797),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15255, 15379),
+            emit_participation: None,
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(659),
+            target: TransformTarget::Callable(DeclarationId(1211)),
+            inputs: vec![PortId(788)],
+            output: PortId(799),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15418, 15435),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(660),
-            target: TransformTarget::Callable(DeclarationId(1195)),
-            inputs: vec![PortId(792), PortId(796)],
-            output: PortId(797),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8548, 8610),
+            target: TransformTarget::Callable(DeclarationId(711)),
+            inputs: vec![PortId(799)],
+            output: PortId(800),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15409, 15436),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(661),
-            target: TransformTarget::Callable(DeclarationId(1181)),
-            inputs: vec![PortId(792), PortId(793)],
-            output: PortId(798),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8658, 8702),
+            target: TransformTarget::Callable(DeclarationId(1223)),
+            inputs: vec![],
+            output: PortId(801),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15451, 15482),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(662),
-            target: TransformTarget::Callable(DeclarationId(1195)),
-            inputs: vec![PortId(792), PortId(798)],
-            output: PortId(799),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8622, 8703),
+            target: TransformTarget::Callable(DeclarationId(2205)),
+            inputs: vec![PortId(801)],
+            output: PortId(802),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15442, 15483),
         }));
-        nodes.push(Behavior::Branch(BranchNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(663),
-            input: PortId(795),
+            target: TransformTarget::Callable(DeclarationId(1223)),
+            inputs: vec![],
+            output: PortId(803),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15498, 15529),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(664),
+            target: TransformTarget::Callable(DeclarationId(2206)),
+            inputs: vec![PortId(803)],
+            output: PortId(804),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15489, 15530),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(665),
+            input: PortId(800),
             paths: vec![
                 Path {
-                    body: NodeId(660),
-                    output: PortId(797),
+                    body: NodeId(662),
+                    output: PortId(802),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "True".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            8548,
-                            8610,
-                        ),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15442, 15483),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(662),
-                    output: PortId(799),
+                    body: NodeId(664),
+                    output: PortId(804),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "False".to_string(),
-                        span: SourceSpan::new(
-                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                            8622,
-                            8703,
-                        ),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15489, 15530),
                     },
                     binding: None,
                 },
             ],
-            output: PortId(800),
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8508, 8703),
+            output: PortId(805),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15406, 15530),
             emit_participation: None,
         }));
-        nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(664),
-            name: "demo_ci_modeled_timing_dimension_report".to_string(),
-            value: PortId(800),
-            params: vec![PortId(792), PortId(793)],
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8508, 8703),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
-        }));
-        nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(665),
-            data: LiteralBits::String("src/v3/std/timing_lens.dag".to_string()),
-            output: PortId(801),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 1472, 1500),
-            lane2_workflow: None,
-        }));
-        nodes.push(Behavior::Bind(BindNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(666),
-            name: "timing_lens_module_path_witness".to_string(),
-            value: PortId(801),
-            params: vec![],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 1472, 1500),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
+            target: TransformTarget::Callable(DeclarationId(1211)),
+            inputs: vec![PortId(788)],
+            output: PortId(807),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15566, 15583),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(667),
-            target: TransformTarget::Callable(DeclarationId(1224)),
-            inputs: vec![
-                PortId(802),
-                PortId(803),
-                PortId(804),
-                PortId(805),
-                PortId(806),
-            ],
-            output: PortId(807),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7332, 7475),
+            target: TransformTarget::Callable(DeclarationId(711)),
+            inputs: vec![PortId(807)],
+            output: PortId(808),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15557, 15584),
         }));
-        nodes.push(Behavior::Bind(BindNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(668),
-            name: "gate_62_file_attachment_demo_record".to_string(),
-            value: PortId(807),
-            params: vec![
-                PortId(802),
-                PortId(803),
-                PortId(804),
-                PortId(805),
-                PortId(806),
-            ],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7332, 7475),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
+            target: TransformTarget::Callable(DeclarationId(1223)),
+            inputs: vec![],
+            output: PortId(809),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15599, 15630),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(669),
-            target: TransformTarget::Callable(DeclarationId(2133)),
-            inputs: vec![],
-            output: PortId(808),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8272, 8282),
+            target: TransformTarget::Callable(DeclarationId(2207)),
+            inputs: vec![PortId(809)],
+            output: PortId(810),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15590, 15631),
         }));
-        nodes.push(Behavior::Bind(BindNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(670),
-            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),
+            target: TransformTarget::Callable(DeclarationId(1223)),
+            inputs: vec![],
+            output: PortId(811),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15646, 15677),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(671),
-            target: TransformTarget::Callable(DeclarationId(2133)),
-            inputs: vec![],
+            target: TransformTarget::Callable(DeclarationId(2208)),
+            inputs: vec![PortId(811)],
             output: PortId(812),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8590, 8600),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15637, 15678),
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Branch(BranchNode {
             id: NodeId(672),
-            target: TransformTarget::Callable(DeclarationId(2133)),
-            inputs: vec![],
+            input: PortId(808),
+            paths: vec![
+                Path {
+                    body: NodeId(669),
+                    output: PortId(810),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "True".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15590, 15631),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(671),
+                    output: PortId(812),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "False".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15637, 15678),
+                    },
+                    binding: None,
+                },
+            ],
             output: PortId(813),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8652, 8662),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15554, 15678),
+            emit_participation: None,
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(673),
-            target: TransformTarget::Callable(DeclarationId(2135)),
-            inputs: vec![],
-            output: PortId(814),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8680, 8685),
+            target: TransformTarget::Callable(DeclarationId(1211)),
+            inputs: vec![PortId(788)],
+            output: PortId(815),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15712, 15729),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(674),
-            target: TransformTarget::Callable(DeclarationId(2135)),
-            inputs: vec![],
-            output: PortId(815),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8707, 8712),
+            target: TransformTarget::Callable(DeclarationId(711)),
+            inputs: vec![PortId(815)],
+            output: PortId(816),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15703, 15730),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(675),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "duration".to_string(),
-            },
-            inputs: vec![PortId(816)],
+            target: TransformTarget::Callable(DeclarationId(1223)),
+            inputs: vec![],
             output: PortId(817),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8732, 8743),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15745, 15776),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(676),
-            target: TransformTarget::Callable(DeclarationId(2135)),
-            inputs: vec![],
+            target: TransformTarget::Callable(DeclarationId(2209)),
+            inputs: vec![PortId(817)],
             output: PortId(818),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8749, 8754),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15736, 15777),
         }));
-        nodes.push(Behavior::Branch(BranchNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(677),
-            input: PortId(810),
+            target: TransformTarget::Callable(DeclarationId(1223)),
+            inputs: vec![],
+            output: PortId(819),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15792, 15823),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(678),
+            target: TransformTarget::Callable(DeclarationId(2210)),
+            inputs: vec![PortId(819)],
+            output: PortId(820),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15783, 15824),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(679),
+            input: PortId(816),
             paths: vec![
                 Path {
-                    body: NodeId(672),
-                    output: PortId(813),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Unobserved".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 8638, 8648),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(673),
-                    output: PortId(814),
+                    body: NodeId(676),
+                    output: PortId(818),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Stale".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 8671, 8676),
+                        name: "True".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15736, 15777),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(674),
-                    output: PortId(815),
+                    body: NodeId(678),
+                    output: PortId(820),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Ambiguous".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 8694, 8703),
+                        name: "False".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15783, 15824),
                     },
                     binding: None,
                 },
-                Path {
-                    body: NodeId(676),
-                    output: PortId(818),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Observed".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 8721, 8745),
-                    },
-                    binding: Some(PayloadBinding {
-                        binding_name: "_".to_string(),
-                        payload_port: PortId(816),
-                    }),
-                },
             ],
-            output: PortId(819),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8620, 8762),
-            emit_participation: Some(BranchEmitParticipation::UserMatch),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(678),
-            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(2135)),
-            inputs: vec![],
             output: PortId(821),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8846, 8851),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15700, 15824),
+            emit_participation: None,
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(680),
-            target: TransformTarget::Callable(DeclarationId(2134)),
-            inputs: vec![],
-            output: PortId(822),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8873, 8882),
+            target: TransformTarget::Callable(DeclarationId(1211)),
+            inputs: vec![PortId(788)],
+            output: PortId(823),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15858, 15875),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(681),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "duration".to_string(),
-            },
+            target: TransformTarget::Callable(DeclarationId(711)),
             inputs: vec![PortId(823)],
             output: PortId(824),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8902, 8913),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15849, 15876),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(682),
-            target: TransformTarget::Callable(DeclarationId(2134)),
+            target: TransformTarget::Callable(DeclarationId(1223)),
             inputs: vec![],
             output: PortId(825),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8919, 8928),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15891, 15922),
         }));
-        nodes.push(Behavior::Branch(BranchNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(683),
-            input: PortId(810),
+            target: TransformTarget::Callable(DeclarationId(2211)),
+            inputs: vec![PortId(825)],
+            output: PortId(826),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15882, 15923),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(684),
+            target: TransformTarget::Callable(DeclarationId(1223)),
+            inputs: vec![],
+            output: PortId(827),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15938, 15969),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(685),
+            target: TransformTarget::Callable(DeclarationId(2212)),
+            inputs: vec![PortId(827)],
+            output: PortId(828),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15929, 15970),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(686),
+            input: PortId(824),
             paths: vec![
                 Path {
-                    body: NodeId(678),
-                    output: PortId(820),
+                    body: NodeId(683),
+                    output: PortId(826),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Unobserved".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 8804, 8814),
+                        name: "True".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15882, 15923),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(679),
-                    output: PortId(821),
+                    body: NodeId(685),
+                    output: PortId(828),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Stale".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 8837, 8842),
+                        name: "False".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15929, 15970),
                     },
                     binding: None,
                 },
+            ],
+            output: PortId(829),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15846, 15970),
+            emit_participation: None,
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(687),
+            input: PortId(789),
+            paths: vec![
                 Path {
-                    body: NodeId(680),
-                    output: PortId(822),
+                    body: NodeId(658),
+                    output: PortId(797),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Ambiguous".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 8860, 8869),
+                        name: "Value".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15237, 15245),
                     },
-                    binding: None,
+                    binding: Some(PayloadBinding {
+                        binding_name: "_".to_string(),
+                        payload_port: PortId(790),
+                    }),
                 },
                 Path {
-                    body: NodeId(682),
-                    output: PortId(825),
+                    body: NodeId(665),
+                    output: PortId(805),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Observed".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 8891, 8915),
+                        name: "Transform".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15384, 15396),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "_".to_string(),
+                        payload_port: PortId(798),
+                    }),
+                },
+                Path {
+                    body: NodeId(672),
+                    output: PortId(813),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Branch".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15535, 15544),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "_".to_string(),
+                        payload_port: PortId(806),
+                    }),
+                },
+                Path {
+                    body: NodeId(679),
+                    output: PortId(821),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Loop".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15683, 15690),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "_".to_string(),
+                        payload_port: PortId(814),
+                    }),
+                },
+                Path {
+                    body: NodeId(686),
+                    output: PortId(829),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Bind".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15829, 15836),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "_".to_string(),
-                        payload_port: PortId(823),
+                        payload_port: PortId(822),
                     }),
                 },
             ],
-            output: PortId(826),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8786, 8936),
-            emit_participation: Some(BranchEmitParticipation::UserMatch),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(684),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "duration".to_string(),
-            },
-            inputs: vec![PortId(827)],
-            output: PortId(828),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8952, 8964),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(685),
-            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(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(2134)),
-            inputs: vec![],
-            output: PortId(831),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9063, 9072),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15223, 15974),
+            emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Bind(BindNode {
             id: NodeId(688),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "duration".to_string(),
-            },
-            inputs: vec![PortId(832)],
-            output: PortId(833),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9092, 9104),
+            name: "timing_lens_read".to_string(),
+            value: PortId(830),
+            params: vec![PortId(788), PortId(789)],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15223, 15974),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(689),
             target: TransformTarget::UnresolvedFieldProject {
-                field_label: "count".to_string(),
+                field_label: "duration".to_string(),
             },
-            inputs: vec![PortId(828)],
+            inputs: vec![PortId(833)],
             output: PortId(834),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9184, 9189),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 16095, 16106),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(690),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "count".to_string(),
-            },
-            inputs: vec![PortId(833)],
+            target: TransformTarget::Callable(DeclarationId(1211)),
+            inputs: vec![PortId(831)],
             output: PortId(835),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9195, 9200),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 16130, 16147),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(691),
-            target: TransformTarget::Operator(OperatorKind::Arithmetic(ArithmeticOp::Add)),
-            inputs: vec![PortId(834), PortId(835)],
+            target: TransformTarget::Callable(DeclarationId(711)),
+            inputs: vec![PortId(835)],
             output: PortId(836),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9181, 9200),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 16121, 16148),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(692),
-            target: TransformTarget::Callable(DeclarationId(1221)),
-            inputs: vec![PortId(836)],
+            target: TransformTarget::Callable(DeclarationId(1984)),
+            inputs: vec![],
             output: PortId(837),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9172, 9202),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 16154, 16166),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(693),
-            target: TransformTarget::Callable(DeclarationId(2132)),
-            inputs: vec![PortId(837)],
+            target: TransformTarget::Callable(DeclarationId(1984)),
+            inputs: vec![],
             output: PortId(838),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9151, 9204),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(694),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "count".to_string(),
-            },
-            inputs: vec![PortId(828)],
-            output: PortId(839),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9273, 9278),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(695),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "count".to_string(),
-            },
-            inputs: vec![PortId(833)],
-            output: PortId(840),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9284, 9289),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(696),
-            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),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 16172, 16184),
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(697),
-            input: PortId(841),
+            id: NodeId(694),
+            input: PortId(836),
             paths: vec![
                 Path {
-                    body: NodeId(684),
-                    output: PortId(828),
+                    body: NodeId(692),
+                    output: PortId(837),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "True".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 9295, 9297),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 16154, 16166),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(688),
-                    output: PortId(833),
+                    body: NodeId(693),
+                    output: PortId(838),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "False".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 9303, 9305),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 16172, 16184),
                     },
                     binding: None,
                 },
             ],
-            output: PortId(842),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9267, 9305),
+            output: PortId(839),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 16118, 16184),
             emit_participation: None,
         }));
+        nodes.push(Behavior::Value(ValueNode { id: NodeId(695), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Unobserved is not admissible evidence at this scaffold (missing external timing row).".to_string()), output: PortId(840), span: SourceSpan::new("src/v3/std/timing_lens.dag", 16263, 16390), lane2_workflow: None }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(696),
+            target: TransformTarget::Callable(DeclarationId(1233)),
+            inputs: vec![PortId(831), PortId(840)],
+            output: PortId(841),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 16209, 16398),
+        }));
+        nodes.push(Behavior::Value(ValueNode { id: NodeId(697), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Ambiguous is not admissible evidence at this scaffold (conflicting timing facts).".to_string()), output: PortId(842), span: SourceSpan::new("src/v3/std/timing_lens.dag", 16476, 16599), lane2_workflow: None }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(698),
-            target: TransformTarget::Callable(DeclarationId(2132)),
-            inputs: vec![PortId(842)],
+            target: TransformTarget::Callable(DeclarationId(1233)),
+            inputs: vec![PortId(831), PortId(842)],
             output: PortId(843),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9232, 9320),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 16422, 16607),
         }));
-        nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(699),
-            input: PortId(811),
-            paths: vec![
-                Path {
-                    body: NodeId(693),
-                    output: PortId(838),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "True".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 9151, 9204),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(698),
-                    output: PortId(843),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "False".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 9232, 9320),
-                    },
-                    binding: None,
-                },
-            ],
-            output: PortId(844),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9120, 9320),
-            emit_participation: None,
+        nodes.push(Behavior::Value(ValueNode { id: NodeId(699), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Stale is not admissible evidence at this scaffold (digest/run mismatch vs attachment).".to_string()), output: PortId(844), span: SourceSpan::new("src/v3/std/timing_lens.dag", 16681, 16809), lane2_workflow: None }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(700),
+            target: TransformTarget::Callable(DeclarationId(1233)),
+            inputs: vec![PortId(831), PortId(844)],
+            output: PortId(845),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 16627, 16817),
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(700),
-            input: PortId(810),
+            id: NodeId(701),
+            input: PortId(832),
             paths: vec![
                 Path {
-                    body: NodeId(685),
-                    output: PortId(829),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Unobserved".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 8994, 9004),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(686),
-                    output: PortId(830),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Stale".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 9027, 9032),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(687),
-                    output: PortId(831),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Ambiguous".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 9050, 9059),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(699),
-                    output: PortId(844),
+                    body: NodeId(694),
+                    output: PortId(839),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Observed".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 9081, 9106),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 16084, 16108),
                     },
                     binding: Some(PayloadBinding {
-                        binding_name: "bx".to_string(),
-                        payload_port: PortId(832),
+                        binding_name: "_".to_string(),
+                        payload_port: PortId(833),
                     }),
                 },
-            ],
-            output: PortId(845),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8976, 9328),
-            emit_participation: Some(BranchEmitParticipation::UserMatch),
-        }));
-        nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(701),
-            input: PortId(809),
-            paths: vec![
                 Path {
-                    body: NodeId(671),
-                    output: PortId(812),
+                    body: NodeId(696),
+                    output: PortId(841),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Unobserved".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 8576, 8586),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(677),
-                    output: PortId(819),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Stale".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 8605, 8610),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 16189, 16199),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(683),
-                    output: PortId(826),
+                    body: NodeId(698),
+                    output: PortId(843),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Ambiguous".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 8767, 8776),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 16403, 16412),
                     },
                     binding: None,
                 },
@@ -7994,1312 +7977,1671 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     body: NodeId(700),
                     output: PortId(845),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Observed".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 8941, 8966),
+                        name: "Stale".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 16612, 16617),
                     },
-                    binding: Some(PayloadBinding {
-                        binding_name: "ax".to_string(),
-                        payload_port: PortId(827),
-                    }),
+                    binding: None,
                 },
             ],
             output: PortId(846),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8562, 9332),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 16063, 16821),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
             id: NodeId(702),
-            name: "timing_measurement_lens_combine".to_string(),
+            name: "timing_lens_validate".to_string(),
             value: PortId(846),
-            params: vec![PortId(809), PortId(810), PortId(811)],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8562, 9332),
+            params: vec![PortId(831), PortId(832)],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 16063, 16821),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Value(ValueNode {
             id: NodeId(703),
-            data: LiteralBits::Bool(true),
-            output: PortId(849),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9538, 9542),
+            data: LiteralBits::Int("999999999999999999".to_string()),
+            output: PortId(847),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 17987, 18005),
             lane2_workflow: None,
         }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(704),
-            target: TransformTarget::Callable(DeclarationId(1231)),
-            inputs: vec![PortId(847), PortId(848), PortId(849)],
-            output: PortId(850),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9500, 9543),
-        }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(705),
-            name: "timing_sequential_op".to_string(),
-            value: PortId(850),
-            params: vec![PortId(847), PortId(848)],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9500, 9543),
+            id: NodeId(704),
+            name: "timing_enforcement_fault_sentinel_count".to_string(),
+            value: PortId(847),
+            params: vec![],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 17987, 18005),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
-        nodes.push(Behavior::Value(ValueNode {
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(705),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "duration".to_string(),
+            },
+            inputs: vec![PortId(849)],
+            output: PortId(850),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18118, 18129),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(706),
-            data: LiteralBits::Int("0".to_string()),
+            target: TransformTarget::Callable(DeclarationId(2197)),
+            inputs: vec![PortId(850)],
             output: PortId(851),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9595, 9596),
-            lane2_workflow: None,
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18135, 18156),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(707),
-            target: TransformTarget::Callable(DeclarationId(1221)),
-            inputs: vec![PortId(851)],
+            target: TransformTarget::Callable(DeclarationId(2198)),
+            inputs: vec![],
             output: PortId(852),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9586, 9598),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18175, 18191),
         }));
-        nodes.push(Behavior::Bind(BindNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(708),
-            name: "nanoseconds_zero".to_string(),
-            value: PortId(852),
-            params: vec![],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9586, 9598),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
+            target: TransformTarget::Callable(DeclarationId(2198)),
+            inputs: vec![],
+            output: PortId(853),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18209, 18225),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(709),
-            target: TransformTarget::Callable(DeclarationId(1233)),
+            target: TransformTarget::Callable(DeclarationId(2198)),
             inputs: vec![],
-            output: PortId(853),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9678, 9696),
+            output: PortId(854),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18239, 18255),
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Branch(BranchNode {
             id: NodeId(710),
-            target: TransformTarget::Callable(DeclarationId(2132)),
-            inputs: vec![PortId(853)],
-            output: PortId(854),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9657, 9698),
+            input: PortId(848),
+            paths: vec![
+                Path {
+                    body: NodeId(706),
+                    output: PortId(851),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Observed".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 18107, 18131),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "d".to_string(),
+                        payload_port: PortId(849),
+                    }),
+                },
+                Path {
+                    body: NodeId(707),
+                    output: PortId(852),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Unobserved".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 18161, 18171),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(708),
+                    output: PortId(853),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Ambiguous".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 18196, 18205),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(709),
+                    output: PortId(854),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Stale".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 18230, 18235),
+                    },
+                    binding: None,
+                },
+            ],
+            output: PortId(855),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18093, 18259),
+            emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
             id: NodeId(711),
-            name: "timing_sequential_identity".to_string(),
-            value: PortId(854),
-            params: vec![],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9657, 9698),
+            name: "timing_enforcement_project".to_string(),
+            value: PortId(855),
+            params: vec![PortId(848)],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18093, 18259),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
-        nodes.push(Behavior::Value(ValueNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(712),
-            data: LiteralBits::Bool(false),
-            output: PortId(857),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9885, 9890),
-            lane2_workflow: None,
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "duration".to_string(),
+            },
+            inputs: vec![PortId(858)],
+            output: PortId(859),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18375, 18386),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(713),
-            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),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "count".to_string(),
+            },
+            inputs: vec![PortId(859)],
+            output: PortId(860),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18403, 18408),
         }));
-        nodes.push(Behavior::Bind(BindNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(714),
-            name: "timing_branch_op".to_string(),
-            value: PortId(858),
-            params: vec![PortId(855), PortId(856)],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9847, 9891),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
+            target: TransformTarget::ResolvedFieldProject {
+                field_label: "max".to_string(),
+            },
+            inputs: vec![PortId(857)],
+            output: PortId(861),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18420, 18423),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(715),
-            target: TransformTarget::Callable(DeclarationId(2137)),
-            inputs: vec![],
-            output: PortId(859),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9952, 9957),
-        }));
-        nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(716),
-            name: "timing_lens_empty_corrections".to_string(),
-            value: PortId(859),
-            params: vec![],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9952, 9957),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(717),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "span".to_string(),
+            target: TransformTarget::ResolvedFieldProject {
+                field_label: "count".to_string(),
             },
             inputs: vec![PortId(861)],
             output: PortId(862),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10228, 10232),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18424, 18429),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(718),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "span".to_string(),
-            },
-            inputs: vec![PortId(863)],
+            id: NodeId(716),
+            target: TransformTarget::Operator(OperatorKind::Comparison(ComparisonOp::Gt)),
+            inputs: vec![PortId(860), PortId(862)],
+            output: PortId(863),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18401, 18429),
+        }));
+        nodes.push(Behavior::Value(ValueNode {
+            id: NodeId(717),
+            data: LiteralBits::Int("0".to_string()),
             output: PortId(864),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10255, 10259),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18435, 18436),
+            lane2_workflow: None,
+        }));
+        nodes.push(Behavior::Value(ValueNode {
+            id: NodeId(718),
+            data: LiteralBits::Int("0".to_string()),
+            output: PortId(865),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18440, 18441),
+            lane2_workflow: None,
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(719),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "span".to_string(),
-            },
-            inputs: vec![PortId(865)],
+            target: TransformTarget::Operator(OperatorKind::Comparison(ComparisonOp::Eq)),
+            inputs: vec![PortId(864), PortId(865)],
             output: PortId(866),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10281, 10285),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18435, 18441),
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Value(ValueNode {
             id: NodeId(720),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "span".to_string(),
-            },
-            inputs: vec![PortId(867)],
+            data: LiteralBits::Int("0".to_string()),
+            output: PortId(867),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18447, 18448),
+            lane2_workflow: None,
+        }));
+        nodes.push(Behavior::Value(ValueNode {
+            id: NodeId(721),
+            data: LiteralBits::Int("1".to_string()),
             output: PortId(868),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10303, 10307),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18452, 18453),
+            lane2_workflow: None,
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(721),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "span".to_string(),
-            },
-            inputs: vec![PortId(869)],
-            output: PortId(870),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10331, 10335),
+            id: NodeId(722),
+            target: TransformTarget::Operator(OperatorKind::Comparison(ComparisonOp::Eq)),
+            inputs: vec![PortId(867), PortId(868)],
+            output: PortId(869),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18447, 18453),
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(722),
-            input: PortId(860),
+            id: NodeId(723),
+            input: PortId(863),
             paths: vec![
-                Path {
-                    body: NodeId(717),
-                    output: PortId(862),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Value".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10214, 10222),
-                    },
-                    binding: Some(PayloadBinding {
-                        binding_name: "v".to_string(),
-                        payload_port: PortId(861),
-                    }),
-                },
-                Path {
-                    body: NodeId(718),
-                    output: PortId(864),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Transform".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10237, 10249),
-                    },
-                    binding: Some(PayloadBinding {
-                        binding_name: "t".to_string(),
-                        payload_port: PortId(863),
-                    }),
-                },
                 Path {
                     body: NodeId(719),
                     output: PortId(866),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Branch".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10264, 10274),
-                    },
-                    binding: Some(PayloadBinding {
-                        binding_name: "br".to_string(),
-                        payload_port: PortId(865),
-                    }),
-                },
-                Path {
-                    body: NodeId(720),
-                    output: PortId(868),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Loop".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10290, 10297),
+                        name: "True".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 18435, 18441),
                     },
-                    binding: Some(PayloadBinding {
-                        binding_name: "l".to_string(),
-                        payload_port: PortId(867),
-                    }),
+                    binding: None,
                 },
                 Path {
-                    body: NodeId(721),
-                    output: PortId(870),
+                    body: NodeId(722),
+                    output: PortId(869),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Bind".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10312, 10322),
+                        name: "False".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 18447, 18453),
                     },
-                    binding: Some(PayloadBinding {
-                        binding_name: "bind".to_string(),
-                        payload_port: PortId(869),
-                    }),
+                    binding: None,
                 },
             ],
-            output: PortId(871),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10200, 10339),
-            emit_participation: Some(BranchEmitParticipation::UserMatch),
-        }));
-        nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(723),
-            name: "timing_lens_behavior_span".to_string(),
-            value: PortId(871),
-            params: vec![PortId(860)],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10200, 10339),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
+            output: PortId(870),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18398, 18453),
+            emit_participation: None,
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Value(ValueNode {
             id: NodeId(724),
-            target: TransformTarget::Callable(DeclarationId(1891)),
-            inputs: vec![],
-            output: PortId(874),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10707, 10719),
+            data: LiteralBits::Int("0".to_string()),
+            output: PortId(871),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18472, 18473),
+            lane2_workflow: None,
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Value(ValueNode {
             id: NodeId(725),
-            target: TransformTarget::Callable(DeclarationId(1897)),
-            inputs: vec![PortId(874)],
-            output: PortId(875),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10694, 10720),
+            data: LiteralBits::Int("0".to_string()),
+            output: PortId(872),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18477, 18478),
+            lane2_workflow: None,
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(726),
-            target: TransformTarget::Callable(DeclarationId(1236)),
-            inputs: vec![],
-            output: PortId(876),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10763, 10794),
+            target: TransformTarget::Operator(OperatorKind::Comparison(ComparisonOp::Eq)),
+            inputs: vec![PortId(871), PortId(872)],
+            output: PortId(873),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18472, 18478),
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Value(ValueNode {
             id: NodeId(727),
-            target: TransformTarget::Callable(DeclarationId(982)),
-            inputs: vec![PortId(875), PortId(873), PortId(872), PortId(876)],
-            output: PortId(877),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10682, 10798),
+            data: LiteralBits::Int("0".to_string()),
+            output: PortId(874),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18496, 18497),
+            lane2_workflow: None,
         }));
-        nodes.push(Behavior::Bind(BindNode {
+        nodes.push(Behavior::Value(ValueNode {
             id: NodeId(728),
-            name: "timing_lens_scaffold_non_evidence_diagnostic".to_string(),
-            value: PortId(877),
-            params: vec![PortId(872), PortId(873)],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10682, 10798),
+            data: LiteralBits::Int("0".to_string()),
+            output: PortId(875),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18501, 18502),
             lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(729),
-            target: TransformTarget::Callable(DeclarationId(1220)),
-            inputs: vec![],
-            output: PortId(878),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11105, 11138),
+            target: TransformTarget::Operator(OperatorKind::Comparison(ComparisonOp::Eq)),
+            inputs: vec![PortId(874), PortId(875)],
+            output: PortId(876),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18496, 18502),
         }));
         nodes.push(Behavior::Value(ValueNode {
             id: NodeId(730),
             data: LiteralBits::Int("0".to_string()),
-            output: PortId(879),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11150, 11151),
+            output: PortId(877),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18516, 18517),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
             id: NodeId(731),
             data: LiteralBits::Int("0".to_string()),
-            output: PortId(880),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11161, 11162),
+            output: PortId(878),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18521, 18522),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(732),
-            target: TransformTarget::Callable(DeclarationId(159)),
-            inputs: vec![PortId(878), PortId(879), PortId(880)],
-            output: PortId(881),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11093, 11166),
+            target: TransformTarget::Operator(OperatorKind::Comparison(ComparisonOp::Eq)),
+            inputs: vec![PortId(877), PortId(878)],
+            output: PortId(879),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18516, 18522),
         }));
-        nodes.push(Behavior::Bind(BindNode {
+        nodes.push(Behavior::Branch(BranchNode {
             id: NodeId(733),
-            name: "timing_lens_degenerate_empty_dag_span".to_string(),
-            value: PortId(881),
-            params: vec![],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11093, 11166),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
+            input: PortId(856),
+            paths: vec![
+                Path {
+                    body: NodeId(723),
+                    output: PortId(870),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Observed".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 18364, 18388),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "d".to_string(),
+                        payload_port: PortId(858),
+                    }),
+                },
+                Path {
+                    body: NodeId(726),
+                    output: PortId(873),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Unobserved".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 18458, 18468),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(729),
+                    output: PortId(876),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Ambiguous".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 18483, 18492),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(732),
+                    output: PortId(879),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Stale".to_string(),
+                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 18507, 18512),
+                    },
+                    binding: None,
+                },
+            ],
+            output: PortId(880),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18350, 18526),
+            emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
-        nodes.push(Behavior::Transform(TransformNode {
+        nodes.push(Behavior::Bind(BindNode {
             id: NodeId(734),
-            target: TransformTarget::Callable(DeclarationId(1293)),
-            inputs: vec![PortId(882)],
-            output: PortId(884),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11719, 11736),
+            name: "timing_enforcement_violates".to_string(),
+            value: PortId(880),
+            params: vec![PortId(856), PortId(857)],
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18350, 18526),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(735),
-            target: TransformTarget::ResolvedFieldProject {
-                field_label: "declarations".to_string(),
-            },
-            inputs: vec![PortId(882)],
-            output: PortId(885),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11766, 11778),
+            target: TransformTarget::Callable(DeclarationId(1227)),
+            inputs: vec![],
+            output: PortId(884),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3308, 3336),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(736),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "head".to_string(),
-            },
-            inputs: vec![PortId(886)],
-            output: PortId(887),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11901, 11905),
+            target: TransformTarget::Callable(DeclarationId(1236)),
+            inputs: vec![PortId(881), PortId(884)],
+            output: PortId(885),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3284, 3337),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(737),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "span".to_string(),
-            },
-            inputs: vec![PortId(887)],
-            output: PortId(888),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11906, 11910),
+            target: TransformTarget::Callable(DeclarationId(1227)),
+            inputs: vec![],
+            output: PortId(886),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3373, 3401),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(738),
-            target: TransformTarget::Callable(DeclarationId(1238)),
-            inputs: vec![PortId(883), PortId(888)],
-            output: PortId(889),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11847, 11911),
+            target: TransformTarget::Callable(DeclarationId(2234)),
+            inputs: vec![PortId(886)],
+            output: PortId(887),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3364, 3402),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(739),
-            target: TransformTarget::Callable(DeclarationId(1925)),
-            inputs: vec![PortId(889)],
-            output: PortId(890),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11811, 11923),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "value".to_string(),
+            },
+            inputs: vec![PortId(888)],
+            output: PortId(889),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3428, 3436),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(740),
-            target: TransformTarget::Callable(DeclarationId(1239)),
+            target: TransformTarget::Callable(DeclarationId(1227)),
             inputs: vec![],
-            output: PortId(891),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12067, 12106),
+            output: PortId(890),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3451, 3479),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(741),
-            target: TransformTarget::Callable(DeclarationId(1238)),
-            inputs: vec![PortId(883), PortId(891)],
-            output: PortId(892),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11987, 12120),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(742),
-            target: TransformTarget::Callable(DeclarationId(1925)),
-            inputs: vec![PortId(892)],
-            output: PortId(893),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11951, 12132),
+            target: TransformTarget::Callable(DeclarationId(2235)),
+            inputs: vec![PortId(890)],
+            output: PortId(891),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3442, 3480),
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(743),
+            id: NodeId(742),
             input: PortId(885),
             paths: vec![
                 Path {
-                    body: NodeId(739),
-                    output: PortId(890),
+                    body: NodeId(738),
+                    output: PortId(887),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Cons".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 11789, 11797),
+                        name: "NoDiagnostic".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            3348,
+                            3360,
+                        ),
                     },
-                    binding: Some(PayloadBinding {
-                        binding_name: "dd".to_string(),
-                        payload_port: PortId(886),
-                    }),
+                    binding: None,
                 },
                 Path {
-                    body: NodeId(742),
-                    output: PortId(893),
+                    body: NodeId(741),
+                    output: PortId(891),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Empty".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 11932, 11937),
+                        name: "SomeDiagnostic".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            3411,
+                            3438,
+                        ),
                     },
-                    binding: None,
+                    binding: Some(PayloadBinding {
+                        binding_name: "_".to_string(),
+                        payload_port: PortId(888),
+                    }),
                 },
             ],
-            output: PortId(894),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11758, 12140),
+            output: PortId(892),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3278, 3488),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(744),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "head".to_string(),
-            },
-            inputs: vec![PortId(895)],
-            output: PortId(896),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12306, 12310),
+            id: NodeId(743),
+            target: TransformTarget::Callable(DeclarationId(1227)),
+            inputs: vec![],
+            output: PortId(894),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3545, 3573),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(744),
+            target: TransformTarget::Callable(DeclarationId(1236)),
+            inputs: vec![PortId(881), PortId(894)],
+            output: PortId(895),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3521, 3574),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(745),
-            target: TransformTarget::Callable(DeclarationId(1237)),
-            inputs: vec![PortId(896)],
-            output: PortId(897),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12272, 12311),
+            target: TransformTarget::Callable(DeclarationId(1227)),
+            inputs: vec![],
+            output: PortId(896),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3610, 3638),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(746),
-            target: TransformTarget::Callable(DeclarationId(1238)),
-            inputs: vec![PortId(883), PortId(897)],
-            output: PortId(898),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12200, 12321),
+            target: TransformTarget::Callable(DeclarationId(2236)),
+            inputs: vec![PortId(896)],
+            output: PortId(897),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3601, 3639),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(747),
-            target: TransformTarget::Callable(DeclarationId(1925)),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "value".to_string(),
+            },
             inputs: vec![PortId(898)],
             output: PortId(899),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12168, 12329),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3665, 3673),
         }));
-        nodes.push(Behavior::Branch(BranchNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(748),
-            input: PortId(884),
+            target: TransformTarget::Callable(DeclarationId(1227)),
+            inputs: vec![],
+            output: PortId(900),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3688, 3716),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(749),
+            target: TransformTarget::Callable(DeclarationId(2237)),
+            inputs: vec![PortId(900)],
+            output: PortId(901),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3679, 3717),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(750),
+            input: PortId(895),
             paths: vec![
                 Path {
-                    body: NodeId(743),
-                    output: PortId(894),
+                    body: NodeId(746),
+                    output: PortId(897),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Empty".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 11743, 11748),
+                        name: "NoDiagnostic".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            3585,
+                            3597,
+                        ),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(747),
-                    output: PortId(899),
+                    body: NodeId(749),
+                    output: PortId(901),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Cons".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 12145, 12158),
+                        name: "SomeDiagnostic".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            3648,
+                            3675,
+                        ),
                     },
                     binding: Some(PayloadBinding {
-                        binding_name: "payload".to_string(),
-                        payload_port: PortId(895),
+                        binding_name: "_".to_string(),
+                        payload_port: PortId(898),
                     }),
                 },
             ],
-            output: PortId(900),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11713, 12333),
+            output: PortId(902),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3515, 3725),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
-        nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(749),
-            name: "timing_lens_validate_non_observed".to_string(),
-            value: PortId(900),
-            params: vec![PortId(882), PortId(883)],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11713, 12333),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(750),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "duration".to_string(),
-            },
-            inputs: vec![PortId(903)],
-            output: PortId(904),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12784, 12795),
-        }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(751),
-            target: TransformTarget::Callable(DeclarationId(1230)),
+            target: TransformTarget::Callable(DeclarationId(1227)),
             inputs: vec![],
-            output: PortId(906),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12847, 12878),
+            output: PortId(904),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3779, 3807),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(752),
-            target: TransformTarget::Callable(DeclarationId(1230)),
-            inputs: vec![],
-            output: PortId(908),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12901, 12932),
+            target: TransformTarget::Callable(DeclarationId(1236)),
+            inputs: vec![PortId(881), PortId(904)],
+            output: PortId(905),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3755, 3808),
         }));
-        nodes.push(Behavior::Branch(BranchNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(753),
-            input: PortId(902),
-            paths: vec![
-                Path {
-                    body: NodeId(751),
-                    output: PortId(906),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Cardinality".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 12829, 12843),
-                    },
-                    binding: Some(PayloadBinding {
-                        binding_name: "_".to_string(),
-                        payload_port: PortId(905),
-                    }),
-                },
-                Path {
-                    body: NodeId(752),
-                    output: PortId(908),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Descent".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 12887, 12897),
-                    },
-                    binding: Some(PayloadBinding {
-                        binding_name: "_".to_string(),
-                        payload_port: PortId(907),
-                    }),
-                },
-            ],
-            output: PortId(909),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12807, 12940),
-            emit_participation: Some(BranchEmitParticipation::UserMatch),
+            target: TransformTarget::Callable(DeclarationId(1227)),
+            inputs: vec![],
+            output: PortId(906),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3844, 3872),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(754),
-            target: TransformTarget::Callable(DeclarationId(2133)),
-            inputs: vec![],
-            output: PortId(910),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12959, 12969),
+            target: TransformTarget::Callable(DeclarationId(2238)),
+            inputs: vec![PortId(906)],
+            output: PortId(907),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3835, 3873),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(755),
-            target: TransformTarget::Callable(DeclarationId(2134)),
-            inputs: vec![],
-            output: PortId(911),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12987, 12996),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "value".to_string(),
+            },
+            inputs: vec![PortId(908)],
+            output: PortId(909),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3899, 3907),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(756),
-            target: TransformTarget::Callable(DeclarationId(2135)),
+            target: TransformTarget::Callable(DeclarationId(1227)),
             inputs: vec![],
-            output: PortId(912),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13010, 13015),
+            output: PortId(910),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3922, 3950),
         }));
-        nodes.push(Behavior::Branch(BranchNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(757),
-            input: PortId(901),
+            target: TransformTarget::Callable(DeclarationId(2239)),
+            inputs: vec![PortId(910)],
+            output: PortId(911),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3913, 3951),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(758),
+            input: PortId(905),
             paths: vec![
-                Path {
-                    body: NodeId(753),
-                    output: PortId(909),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Observed".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 12773, 12797),
-                    },
-                    binding: Some(PayloadBinding {
-                        binding_name: "_".to_string(),
-                        payload_port: PortId(903),
-                    }),
-                },
                 Path {
                     body: NodeId(754),
-                    output: PortId(910),
+                    output: PortId(907),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Unobserved".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 12945, 12955),
+                        name: "NoDiagnostic".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            3819,
+                            3831,
+                        ),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(755),
+                    body: NodeId(757),
                     output: PortId(911),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Ambiguous".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 12974, 12983),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(756),
-                    output: PortId(912),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Stale".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 13001, 13006),
+                        name: "SomeDiagnostic".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            3882,
+                            3909,
+                        ),
                     },
-                    binding: None,
+                    binding: Some(PayloadBinding {
+                        binding_name: "_".to_string(),
+                        payload_port: PortId(908),
+                    }),
                 },
             ],
-            output: PortId(913),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12756, 13019),
+            output: PortId(912),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3749, 3959),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
-        nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(758),
-            name: "timing_measurement_iterate".to_string(),
-            value: PortId(913),
-            params: vec![PortId(901), PortId(902)],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12756, 13019),
-            lane2_workflow: None,
-            emit_participation: Some(BindEmitParticipation::UserCallable),
-        }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(759),
-            target: TransformTarget::Callable(DeclarationId(1293)),
-            inputs: vec![PortId(914)],
-            output: PortId(917),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13915, 13932),
+            target: TransformTarget::Callable(DeclarationId(1227)),
+            inputs: vec![],
+            output: PortId(914),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4011, 4039),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(760),
-            target: TransformTarget::Callable(DeclarationId(711)),
-            inputs: vec![PortId(917)],
-            output: PortId(918),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13906, 13933),
+            target: TransformTarget::Callable(DeclarationId(1236)),
+            inputs: vec![PortId(881), PortId(914)],
+            output: PortId(915),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3987, 4040),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(761),
-            target: TransformTarget::Callable(DeclarationId(1230)),
+            target: TransformTarget::Callable(DeclarationId(1227)),
             inputs: vec![],
-            output: PortId(919),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13948, 13979),
+            output: PortId(916),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4076, 4104),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(762),
-            target: TransformTarget::Callable(DeclarationId(2138)),
-            inputs: vec![PortId(919)],
-            output: PortId(920),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13939, 13980),
+            target: TransformTarget::Callable(DeclarationId(2240)),
+            inputs: vec![PortId(916)],
+            output: PortId(917),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4067, 4105),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(763),
-            target: TransformTarget::Callable(DeclarationId(1230)),
-            inputs: vec![],
-            output: PortId(921),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13995, 14026),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "value".to_string(),
+            },
+            inputs: vec![PortId(918)],
+            output: PortId(919),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4131, 4139),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(764),
-            target: TransformTarget::Callable(DeclarationId(2139)),
-            inputs: vec![PortId(921)],
-            output: PortId(922),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13986, 14027),
+            target: TransformTarget::Callable(DeclarationId(1227)),
+            inputs: vec![],
+            output: PortId(920),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4154, 4182),
         }));
-        nodes.push(Behavior::Branch(BranchNode {
+        nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(765),
-            input: PortId(918),
+            target: TransformTarget::Callable(DeclarationId(2241)),
+            inputs: vec![PortId(920)],
+            output: PortId(921),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4145, 4183),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(766),
+            input: PortId(915),
             paths: vec![
                 Path {
                     body: NodeId(762),
-                    output: PortId(920),
+                    output: PortId(917),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "True".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 13939, 13980),
+                        name: "NoDiagnostic".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            4051,
+                            4063,
+                        ),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(764),
-                    output: PortId(922),
+                    body: NodeId(765),
+                    output: PortId(921),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "False".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 13986, 14027),
+                        name: "SomeDiagnostic".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            4114,
+                            4141,
+                        ),
                     },
-                    binding: None,
+                    binding: Some(PayloadBinding {
+                        binding_name: "_".to_string(),
+                        payload_port: PortId(918),
+                    }),
                 },
             ],
-            output: PortId(923),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13903, 14027),
-            emit_participation: None,
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(766),
-            target: TransformTarget::Callable(DeclarationId(1293)),
-            inputs: vec![PortId(914)],
-            output: PortId(925),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14066, 14083),
+            output: PortId(922),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3981, 4191),
+            emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(767),
-            target: TransformTarget::Callable(DeclarationId(711)),
-            inputs: vec![PortId(925)],
-            output: PortId(926),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14057, 14084),
+            target: TransformTarget::Callable(DeclarationId(1227)),
+            inputs: vec![],
+            output: PortId(924),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4243, 4271),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(768),
-            target: TransformTarget::Callable(DeclarationId(1230)),
-            inputs: vec![],
-            output: PortId(927),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14099, 14130),
+            target: TransformTarget::Callable(DeclarationId(1236)),
+            inputs: vec![PortId(881), PortId(924)],
+            output: PortId(925),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4219, 4272),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(769),
-            target: TransformTarget::Callable(DeclarationId(2140)),
-            inputs: vec![PortId(927)],
-            output: PortId(928),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14090, 14131),
+            target: TransformTarget::Callable(DeclarationId(1227)),
+            inputs: vec![],
+            output: PortId(926),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4308, 4336),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(770),
-            target: TransformTarget::Callable(DeclarationId(1230)),
-            inputs: vec![],
-            output: PortId(929),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14146, 14177),
+            target: TransformTarget::Callable(DeclarationId(2242)),
+            inputs: vec![PortId(926)],
+            output: PortId(927),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4299, 4337),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(771),
-            target: TransformTarget::Callable(DeclarationId(2141)),
-            inputs: vec![PortId(929)],
-            output: PortId(930),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14137, 14178),
-        }));
-        nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(772),
-            input: PortId(926),
-            paths: vec![
-                Path {
-                    body: NodeId(769),
-                    output: PortId(928),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "True".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14090, 14131),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(771),
-                    output: PortId(930),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "False".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14137, 14178),
-                    },
-                    binding: None,
-                },
-            ],
-            output: PortId(931),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14054, 14178),
-            emit_participation: None,
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(773),
-            target: TransformTarget::Callable(DeclarationId(1293)),
-            inputs: vec![PortId(914)],
-            output: PortId(933),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14214, 14231),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(774),
-            target: TransformTarget::Callable(DeclarationId(711)),
-            inputs: vec![PortId(933)],
-            output: PortId(934),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14205, 14232),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(775),
-            target: TransformTarget::Callable(DeclarationId(1230)),
-            inputs: vec![],
-            output: PortId(935),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14247, 14278),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(776),
-            target: TransformTarget::Callable(DeclarationId(2142)),
-            inputs: vec![PortId(935)],
-            output: PortId(936),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14238, 14279),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(777),
-            target: TransformTarget::Callable(DeclarationId(1230)),
-            inputs: vec![],
-            output: PortId(937),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14294, 14325),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(778),
-            target: TransformTarget::Callable(DeclarationId(2143)),
-            inputs: vec![PortId(937)],
-            output: PortId(938),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14285, 14326),
-        }));
-        nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(779),
-            input: PortId(934),
-            paths: vec![
-                Path {
-                    body: NodeId(776),
-                    output: PortId(936),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "True".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14238, 14279),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(778),
-                    output: PortId(938),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "False".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14285, 14326),
-                    },
-                    binding: None,
-                },
-            ],
-            output: PortId(939),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14202, 14326),
-            emit_participation: None,
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(780),
-            target: TransformTarget::Callable(DeclarationId(1293)),
-            inputs: vec![PortId(914)],
-            output: PortId(941),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14360, 14377),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(781),
-            target: TransformTarget::Callable(DeclarationId(711)),
-            inputs: vec![PortId(941)],
-            output: PortId(942),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14351, 14378),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(782),
-            target: TransformTarget::Callable(DeclarationId(1230)),
-            inputs: vec![],
-            output: PortId(943),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14393, 14424),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(783),
-            target: TransformTarget::Callable(DeclarationId(2144)),
-            inputs: vec![PortId(943)],
-            output: PortId(944),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14384, 14425),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(784),
-            target: TransformTarget::Callable(DeclarationId(1230)),
-            inputs: vec![],
-            output: PortId(945),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14440, 14471),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(785),
-            target: TransformTarget::Callable(DeclarationId(2145)),
-            inputs: vec![PortId(945)],
-            output: PortId(946),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14431, 14472),
-        }));
-        nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(786),
-            input: PortId(942),
-            paths: vec![
-                Path {
-                    body: NodeId(783),
-                    output: PortId(944),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "True".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14384, 14425),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(785),
-                    output: PortId(946),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "False".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14431, 14472),
-                    },
-                    binding: None,
-                },
-            ],
-            output: PortId(947),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14348, 14472),
-            emit_participation: None,
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(787),
-            target: TransformTarget::Callable(DeclarationId(1293)),
-            inputs: vec![PortId(914)],
-            output: PortId(949),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14506, 14523),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(788),
-            target: TransformTarget::Callable(DeclarationId(711)),
-            inputs: vec![PortId(949)],
-            output: PortId(950),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14497, 14524),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(789),
-            target: TransformTarget::Callable(DeclarationId(1230)),
-            inputs: vec![],
-            output: PortId(951),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14539, 14570),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(790),
-            target: TransformTarget::Callable(DeclarationId(2146)),
-            inputs: vec![PortId(951)],
-            output: PortId(952),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14530, 14571),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "value".to_string(),
+            },
+            inputs: vec![PortId(928)],
+            output: PortId(929),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4363, 4371),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(791),
-            target: TransformTarget::Callable(DeclarationId(1230)),
+            id: NodeId(772),
+            target: TransformTarget::Callable(DeclarationId(1227)),
             inputs: vec![],
-            output: PortId(953),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14586, 14617),
+            output: PortId(930),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4386, 4414),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(792),
-            target: TransformTarget::Callable(DeclarationId(2147)),
-            inputs: vec![PortId(953)],
-            output: PortId(954),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14577, 14618),
+            id: NodeId(773),
+            target: TransformTarget::Callable(DeclarationId(2243)),
+            inputs: vec![PortId(930)],
+            output: PortId(931),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4377, 4415),
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(793),
-            input: PortId(950),
+            id: NodeId(774),
+            input: PortId(925),
             paths: vec![
                 Path {
-                    body: NodeId(790),
-                    output: PortId(952),
+                    body: NodeId(770),
+                    output: PortId(927),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "True".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14530, 14571),
+                        name: "NoDiagnostic".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            4283,
+                            4295,
+                        ),
                     },
                     binding: None,
                 },
                 Path {
-                    body: NodeId(792),
-                    output: PortId(954),
+                    body: NodeId(773),
+                    output: PortId(931),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "False".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14577, 14618),
+                        name: "SomeDiagnostic".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            4346,
+                            4373,
+                        ),
                     },
-                    binding: None,
+                    binding: Some(PayloadBinding {
+                        binding_name: "_".to_string(),
+                        payload_port: PortId(928),
+                    }),
                 },
             ],
-            output: PortId(955),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14494, 14618),
-            emit_participation: None,
+            output: PortId(932),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4213, 4423),
+            emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(794),
-            input: PortId(915),
+            id: NodeId(775),
+            input: PortId(882),
             paths: vec![
                 Path {
-                    body: NodeId(765),
-                    output: PortId(923),
+                    body: NodeId(742),
+                    output: PortId(892),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Value".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 13885, 13893),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            3260,
+                            3268,
+                        ),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "_".to_string(),
-                        payload_port: PortId(916),
+                        payload_port: PortId(883),
                     }),
                 },
                 Path {
-                    body: NodeId(772),
-                    output: PortId(931),
+                    body: NodeId(750),
+                    output: PortId(902),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Transform".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14032, 14044),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            3493,
+                            3505,
+                        ),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "_".to_string(),
-                        payload_port: PortId(924),
+                        payload_port: PortId(893),
                     }),
                 },
                 Path {
-                    body: NodeId(779),
-                    output: PortId(939),
+                    body: NodeId(758),
+                    output: PortId(912),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Branch".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14183, 14192),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            3730,
+                            3739,
+                        ),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "_".to_string(),
-                        payload_port: PortId(932),
+                        payload_port: PortId(903),
                     }),
                 },
                 Path {
-                    body: NodeId(786),
-                    output: PortId(947),
+                    body: NodeId(766),
+                    output: PortId(922),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Loop".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14331, 14338),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            3964,
+                            3971,
+                        ),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "_".to_string(),
-                        payload_port: PortId(940),
+                        payload_port: PortId(913),
                     }),
                 },
                 Path {
-                    body: NodeId(793),
-                    output: PortId(955),
+                    body: NodeId(774),
+                    output: PortId(932),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Bind".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14477, 14484),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            4196,
+                            4203,
+                        ),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "_".to_string(),
-                        payload_port: PortId(948),
+                        payload_port: PortId(923),
                     }),
                 },
             ],
-            output: PortId(956),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13871, 14622),
+            output: PortId(933),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3246, 4427),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(795),
-            name: "timing_lens_read".to_string(),
-            value: PortId(956),
-            params: vec![PortId(914), PortId(915)],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13871, 14622),
+            id: NodeId(776),
+            name: "ci_demo_timing_read".to_string(),
+            value: PortId(933),
+            params: vec![PortId(881), PortId(882)],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3246, 4427),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(796),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "duration".to_string(),
-            },
-            inputs: vec![PortId(959)],
-            output: PortId(960),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14743, 14754),
+            id: NodeId(777),
+            target: TransformTarget::Callable(DeclarationId(1245)),
+            inputs: vec![PortId(934), PortId(935)],
+            output: PortId(936),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4818, 4843),
         }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(797),
-            target: TransformTarget::Callable(DeclarationId(1293)),
-            inputs: vec![PortId(957)],
-            output: PortId(961),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14778, 14795),
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(778),
+            name: "ci_wad_modeled_workflow_timing_witness".to_string(),
+            value: PortId(936),
+            params: vec![PortId(934), PortId(935)],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4818, 4843),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(798),
-            target: TransformTarget::Callable(DeclarationId(711)),
-            inputs: vec![PortId(961)],
-            output: PortId(962),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14769, 14796),
+            id: NodeId(779),
+            target: TransformTarget::Callable(DeclarationId(2244)),
+            inputs: vec![],
+            output: PortId(937),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5101, 5106),
+        }));
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(780),
+            name: "_ci_wad_seed_list_declaration_empty".to_string(),
+            value: PortId(937),
+            params: vec![],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5101, 5106),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(799),
-            target: TransformTarget::Callable(DeclarationId(1924)),
+            id: NodeId(781),
+            target: TransformTarget::Callable(DeclarationId(2245)),
             inputs: vec![],
-            output: PortId(963),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14802, 14814),
+            output: PortId(938),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5166, 5171),
+        }));
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(782),
+            name: "_ci_wad_seed_list_behavior_empty".to_string(),
+            value: PortId(938),
+            params: vec![],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5166, 5171),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(800),
-            target: TransformTarget::Callable(DeclarationId(1924)),
+            id: NodeId(783),
+            target: TransformTarget::Callable(DeclarationId(2246)),
             inputs: vec![],
-            output: PortId(964),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14820, 14832),
+            output: PortId(939),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5229, 5234),
         }));
-        nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(801),
-            input: PortId(962),
-            paths: vec![
-                Path {
-                    body: NodeId(799),
-                    output: PortId(963),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "True".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14802, 14814),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(800),
-                    output: PortId(964),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "False".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14820, 14832),
-                    },
-                    binding: None,
-                },
-            ],
-            output: PortId(965),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14766, 14832),
-            emit_participation: None,
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(784),
+            name: "_ci_wad_seed_list_dagport_empty".to_string(),
+            value: PortId(939),
+            params: vec![],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5229, 5234),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
-        nodes.push(Behavior::Value(ValueNode { id: NodeId(802), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Unobserved is not admissible evidence at this scaffold (missing external timing row).".to_string()), output: PortId(966), span: SourceSpan::new("src/v3/std/timing_lens.dag", 14911, 15038), lane2_workflow: None }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(803),
-            target: TransformTarget::Callable(DeclarationId(1240)),
-            inputs: vec![PortId(957), PortId(966)],
-            output: PortId(967),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14857, 15046),
+            id: NodeId(785),
+            target: TransformTarget::Callable(DeclarationId(2247)),
+            inputs: vec![],
+            output: PortId(940),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5292, 5297),
         }));
-        nodes.push(Behavior::Value(ValueNode { id: NodeId(804), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Ambiguous is not admissible evidence at this scaffold (conflicting timing facts).".to_string()), output: PortId(968), span: SourceSpan::new("src/v3/std/timing_lens.dag", 15124, 15247), lane2_workflow: None }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(805),
-            target: TransformTarget::Callable(DeclarationId(1240)),
-            inputs: vec![PortId(957), PortId(968)],
-            output: PortId(969),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15070, 15255),
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(786),
+            name: "_ci_wad_seed_list_cluster_empty".to_string(),
+            value: PortId(940),
+            params: vec![],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5292, 5297),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
-        nodes.push(Behavior::Value(ValueNode { id: NodeId(806), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Stale is not admissible evidence at this scaffold (digest/run mismatch vs attachment).".to_string()), output: PortId(970), span: SourceSpan::new("src/v3/std/timing_lens.dag", 15329, 15457), lane2_workflow: None }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(807),
-            target: TransformTarget::Callable(DeclarationId(1240)),
-            inputs: vec![PortId(957), PortId(970)],
-            output: PortId(971),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15275, 15465),
-        }));
-        nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(808),
-            input: PortId(958),
-            paths: vec![
-                Path {
-                    body: NodeId(801),
-                    output: PortId(965),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Observed".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14732, 14756),
-                    },
-                    binding: Some(PayloadBinding {
-                        binding_name: "_".to_string(),
-                        payload_port: PortId(959),
-                    }),
-                },
-                Path {
-                    body: NodeId(803),
-                    output: PortId(967),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Unobserved".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 14837, 14847),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(805),
-                    output: PortId(969),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Ambiguous".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15051, 15060),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(807),
-                    output: PortId(971),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Stale".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 15260, 15265),
-                    },
-                    binding: None,
-                },
-            ],
-            output: PortId(972),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14711, 15469),
-            emit_participation: Some(BranchEmitParticipation::UserMatch),
+            id: NodeId(787),
+            target: TransformTarget::Callable(DeclarationId(2248)),
+            inputs: vec![],
+            output: PortId(941),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5356, 5361),
         }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(809),
-            name: "timing_lens_validate".to_string(),
-            value: PortId(972),
-            params: vec![PortId(957), PortId(958)],
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14711, 15469),
+            id: NodeId(788),
+            name: "_ci_wad_empty_list_diagnostic".to_string(),
+            value: PortId(941),
+            params: vec![],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5356, 5361),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(810),
-            target: TransformTarget::Callable(DeclarationId(1289)),
-            inputs: vec![PortId(974)],
-            output: PortId(975),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28552, 28575),
+            id: NodeId(789),
+            target: TransformTarget::Callable(DeclarationId(2249)),
+            inputs: vec![],
+            output: PortId(942),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5436, 5441),
+        }));
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(790),
+            name: "_ci_wad_empty_list_witness_tm".to_string(),
+            value: PortId(942),
+            params: vec![],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5436, 5441),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(791),
+            target: TransformTarget::Callable(DeclarationId(2251)),
+            inputs: vec![PortId(943)],
+            output: PortId(944),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5552, 5563),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(792),
+            target: TransformTarget::Callable(DeclarationId(1252)),
+            inputs: vec![],
+            output: PortId(945),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5571, 5602),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(793),
+            target: TransformTarget::Callable(DeclarationId(2250)),
+            inputs: vec![PortId(944), PortId(945)],
+            output: PortId(946),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5539, 5604),
+        }));
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(794),
+            name: "_ci_wad_witnesses_singleton_tm".to_string(),
+            value: PortId(946),
+            params: vec![PortId(943)],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5539, 5604),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(795),
+            target: TransformTarget::Callable(DeclarationId(1251)),
+            inputs: vec![],
+            output: PortId(948),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5705, 5736),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(796),
+            target: TransformTarget::Callable(DeclarationId(2252)),
+            inputs: vec![PortId(947), PortId(948)],
+            output: PortId(949),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5680, 5738),
+        }));
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(797),
+            name: "_ci_wad_violations_singleton".to_string(),
+            value: PortId(949),
+            params: vec![PortId(947)],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5680, 5738),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
+        }));
+        nodes.push(Behavior::Value(ValueNode {
+            id: NodeId(798),
+            data: LiteralBits::String("ci_modeled_timing".to_string()),
+            output: PortId(951),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5873, 5892),
+            lane2_workflow: None,
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(799),
+            target: TransformTarget::Callable(DeclarationId(1253)),
+            inputs: vec![PortId(950)],
+            output: PortId(952),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5926, 5959),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(800),
+            target: TransformTarget::Callable(DeclarationId(2253)),
+            inputs: vec![PortId(951), PortId(950), PortId(952)],
+            output: PortId(953),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5839, 5964),
+        }));
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(801),
+            name: "_ci_wad_dimension_ok_tm_payload".to_string(),
+            value: PortId(953),
+            params: vec![PortId(950)],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5839, 5964),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
+        }));
+        nodes.push(Behavior::Value(ValueNode {
+            id: NodeId(802),
+            data: LiteralBits::String("ci_modeled_timing".to_string()),
+            output: PortId(956),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6121, 6140),
+            lane2_workflow: None,
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(803),
+            target: TransformTarget::Callable(DeclarationId(1254)),
+            inputs: vec![PortId(955)],
+            output: PortId(957),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6158, 6192),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(804),
+            target: TransformTarget::Callable(DeclarationId(1253)),
+            inputs: vec![PortId(954)],
+            output: PortId(958),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6209, 6242),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(805),
+            target: TransformTarget::Callable(DeclarationId(2254)),
+            inputs: vec![PortId(956), PortId(957), PortId(958)],
+            output: PortId(959),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6085, 6247),
+        }));
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(806),
+            name: "_ci_wad_dimension_fail_tm_payload".to_string(),
+            value: PortId(959),
+            params: vec![PortId(954), PortId(955)],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6085, 6247),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(807),
+            target: TransformTarget::Callable(DeclarationId(1211)),
+            inputs: vec![PortId(960)],
+            output: PortId(962),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6610, 6627),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(808),
+            target: TransformTarget::Callable(DeclarationId(1255)),
+            inputs: vec![PortId(961)],
+            output: PortId(963),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6643, 6677),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(809),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "head".to_string(),
+            },
+            inputs: vec![PortId(964)],
+            output: PortId(965),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6689, 6697),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(810),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "tail".to_string(),
+            },
+            inputs: vec![PortId(964)],
+            output: PortId(966),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6699, 6707),
         }));
         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", 28597, 28631),
+            target: TransformTarget::Callable(DeclarationId(1255)),
+            inputs: vec![PortId(961)],
+            output: PortId(967),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6713, 6747),
         }));
         nodes.push(Behavior::Branch(BranchNode {
             id: NodeId(812),
-            input: PortId(973),
+            input: PortId(962),
             paths: vec![
                 Path {
-                    body: NodeId(810),
-                    output: PortId(975),
+                    body: NodeId(808),
+                    output: PortId(963),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Enumerated".to_string(),
-                        span: SourceSpan::new("src/v3/std/verification.dag", 28535, 28548),
+                        name: "Empty".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            6634,
+                            6639,
+                        ),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(811),
+                    output: PortId(967),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Cons".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            6682,
+                            6709,
+                        ),
                     },
                     binding: Some(PayloadBinding {
-                        binding_name: "c".to_string(),
-                        payload_port: PortId(974),
+                        binding_name: "__payload_6682_6709".to_string(),
+                        payload_port: PortId(964),
                     }),
                 },
+            ],
+            output: PortId(968),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6604, 6751),
+            emit_participation: Some(BranchEmitParticipation::UserMatch),
+        }));
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(813),
+            name: "report_dim_ok_tm".to_string(),
+            value: PortId(968),
+            params: vec![PortId(960), PortId(961)],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6604, 6751),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(814),
+            target: TransformTarget::Callable(DeclarationId(1211)),
+            inputs: vec![PortId(969)],
+            output: PortId(972),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6871, 6888),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(815),
+            target: TransformTarget::Callable(DeclarationId(1256)),
+            inputs: vec![PortId(970), PortId(971)],
+            output: PortId(973),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6904, 6946),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(816),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "head".to_string(),
+            },
+            inputs: vec![PortId(974)],
+            output: PortId(975),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6958, 6966),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(817),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "tail".to_string(),
+            },
+            inputs: vec![PortId(974)],
+            output: PortId(976),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6968, 6976),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(818),
+            target: TransformTarget::Callable(DeclarationId(1256)),
+            inputs: vec![PortId(970), PortId(971)],
+            output: PortId(977),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6982, 7024),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(819),
+            input: PortId(972),
+            paths: vec![
+                Path {
+                    body: NodeId(815),
+                    output: PortId(973),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Empty".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            6895,
+                            6900,
+                        ),
+                    },
+                    binding: None,
+                },
                 Path {
-                    body: NodeId(811),
+                    body: NodeId(818),
                     output: PortId(977),
                     pattern: BranchPattern::UnresolvedVariant {
-                        name: "Quantified".to_string(),
-                        span: SourceSpan::new("src/v3/std/verification.dag", 28580, 28593),
+                        name: "Cons".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            6951,
+                            6978,
+                        ),
                     },
                     binding: Some(PayloadBinding {
-                        binding_name: "q".to_string(),
-                        payload_port: PortId(976),
+                        binding_name: "__payload_6951_6978".to_string(),
+                        payload_port: PortId(974),
                     }),
                 },
             ],
             output: PortId(978),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28517, 28635),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6865, 7028),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(813),
-            name: "obligation_for_suite_claim".to_string(),
+            id: NodeId(820),
+            name: "report_dim_fail_tm".to_string(),
             value: PortId(978),
-            params: vec![PortId(973)],
-            span: SourceSpan::new("src/v3/std/verification.dag", 28517, 28635),
+            params: vec![PortId(969), PortId(970), PortId(971)],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6865, 7028),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(814),
-            target: TransformTarget::ResolvedFieldProject {
-                field_label: "nodes".to_string(),
+            id: NodeId(821),
+            target: TransformTarget::Callable(DeclarationId(1257)),
+            inputs: vec![PortId(979), PortId(980)],
+            output: PortId(982),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7186, 7208),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(822),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "value".to_string(),
             },
-            inputs: vec![PortId(979)],
-            output: PortId(980),
-            span: SourceSpan::new("src/v3/std/workflows.dag", 1013, 1018),
+            inputs: vec![PortId(983)],
+            output: PortId(984),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7230, 7241),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(823),
+            target: TransformTarget::Callable(DeclarationId(1258)),
+            inputs: vec![PortId(979), PortId(980), PortId(984)],
+            output: PortId(985),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7247, 7277),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(824),
+            input: PortId(981),
+            paths: vec![
+                Path {
+                    body: NodeId(821),
+                    output: PortId(982),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "NoDiagnostic".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            7170,
+                            7182,
+                        ),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(823),
+                    output: PortId(985),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "SomeDiagnostic".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            7213,
+                            7243,
+                        ),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "diag".to_string(),
+                        payload_port: PortId(983),
+                    }),
+                },
+            ],
+            output: PortId(986),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7155, 7281),
+            emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(815),
-            name: "behavior_spine".to_string(),
-            value: PortId(980),
-            params: vec![PortId(979)],
-            span: SourceSpan::new("src/v3/std/workflows.dag", 1011, 1018),
+            id: NodeId(825),
+            name: "report_inhabits_branch_tm".to_string(),
+            value: PortId(986),
+            params: vec![PortId(979), PortId(980), PortId(981)],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7155, 7281),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(826),
+            target: TransformTarget::Callable(DeclarationId(1236)),
+            inputs: vec![PortId(987), PortId(989)],
+            output: PortId(990),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7461, 7487),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(827),
+            target: TransformTarget::Callable(DeclarationId(1259)),
+            inputs: vec![PortId(987), PortId(989), PortId(990)],
+            output: PortId(991),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7429, 7488),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(828),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "reason".to_string(),
+            },
+            inputs: vec![PortId(992)],
+            output: PortId(993),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7504, 7513),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(829),
+            target: TransformTarget::UnresolvedFieldProject {
+                field_label: "at".to_string(),
+            },
+            inputs: vec![PortId(992)],
+            output: PortId(994),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7515, 7522),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(830),
+            target: TransformTarget::Callable(DeclarationId(1227)),
+            inputs: vec![],
+            output: PortId(995),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7573, 7601),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(831),
+            target: TransformTarget::Callable(DeclarationId(1230)),
+            inputs: vec![PortId(994)],
+            output: PortId(996),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7659, 7689),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(832),
+            target: TransformTarget::Callable(DeclarationId(1231)),
+            inputs: vec![PortId(993), PortId(996)],
+            output: PortId(997),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7611, 7690),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(833),
+            target: TransformTarget::Callable(DeclarationId(1258)),
+            inputs: vec![PortId(987), PortId(995), PortId(997)],
+            output: PortId(998),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7534, 7698),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(834),
+            input: PortId(988),
+            paths: vec![
+                Path {
+                    body: NodeId(827),
+                    output: PortId(991),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Inhabits".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            7414,
+                            7425,
+                        ),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "c".to_string(),
+                        payload_port: PortId(989),
+                    }),
+                },
+                Path {
+                    body: NodeId(833),
+                    output: PortId(998),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Violates".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            7493,
+                            7524,
+                        ),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "__payload_7493_7524".to_string(),
+                        payload_port: PortId(992),
+                    }),
+                },
+            ],
+            output: PortId(999),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7400, 7702),
+            emit_participation: Some(BranchEmitParticipation::UserMatch),
+        }));
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(835),
+            name: "dimension_report_tm_from_witness".to_string(),
+            value: PortId(999),
+            params: vec![PortId(987), PortId(988)],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7400, 7702),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(836),
+            target: TransformTarget::Callable(DeclarationId(1211)),
+            inputs: vec![PortId(1000)],
+            output: PortId(1002),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8681, 8698),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(837),
+            target: TransformTarget::Callable(DeclarationId(711)),
+            inputs: vec![PortId(1002)],
+            output: PortId(1003),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8672, 8699),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(838),
+            target: TransformTarget::Callable(DeclarationId(1245)),
+            inputs: vec![PortId(1000), PortId(1001)],
+            output: PortId(1004),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8745, 8770),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(839),
+            target: TransformTarget::Callable(DeclarationId(1260)),
+            inputs: vec![PortId(1000), PortId(1004)],
+            output: PortId(1005),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8709, 8771),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(840),
+            target: TransformTarget::Callable(DeclarationId(1246)),
+            inputs: vec![PortId(1000), PortId(1001)],
+            output: PortId(1006),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8819, 8863),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(841),
+            target: TransformTarget::Callable(DeclarationId(1260)),
+            inputs: vec![PortId(1000), PortId(1006)],
+            output: PortId(1007),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8783, 8864),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(842),
+            input: PortId(1003),
+            paths: vec![
+                Path {
+                    body: NodeId(839),
+                    output: PortId(1005),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "True".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            8709,
+                            8771,
+                        ),
+                    },
+                    binding: None,
+                },
+                Path {
+                    body: NodeId(841),
+                    output: PortId(1007),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "False".to_string(),
+                        span: SourceSpan::new(
+                            "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                            8783,
+                            8864,
+                        ),
+                    },
+                    binding: None,
+                },
+            ],
+            output: PortId(1008),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8669, 8864),
+            emit_participation: None,
+        }));
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(843),
+            name: "demo_ci_modeled_timing_dimension_report".to_string(),
+            value: PortId(1008),
+            params: vec![PortId(1000), PortId(1001)],
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8669, 8864),
+            lane2_workflow: None,
+            emit_participation: Some(BindEmitParticipation::UserCallable),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(844),
+            target: TransformTarget::Callable(DeclarationId(1304)),
+            inputs: vec![PortId(1010)],
+            output: PortId(1011),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28552, 28575),
+        }));
+        nodes.push(Behavior::Transform(TransformNode {
+            id: NodeId(845),
+            target: TransformTarget::Callable(DeclarationId(1305)),
+            inputs: vec![PortId(1012)],
+            output: PortId(1013),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28597, 28631),
+        }));
+        nodes.push(Behavior::Branch(BranchNode {
+            id: NodeId(846),
+            input: PortId(1009),
+            paths: vec![
+                Path {
+                    body: NodeId(844),
+                    output: PortId(1011),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Enumerated".to_string(),
+                        span: SourceSpan::new("src/v3/std/verification.dag", 28535, 28548),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "c".to_string(),
+                        payload_port: PortId(1010),
+                    }),
+                },
+                Path {
+                    body: NodeId(845),
+                    output: PortId(1013),
+                    pattern: BranchPattern::UnresolvedVariant {
+                        name: "Quantified".to_string(),
+                        span: SourceSpan::new("src/v3/std/verification.dag", 28580, 28593),
+                    },
+                    binding: Some(PayloadBinding {
+                        binding_name: "q".to_string(),
+                        payload_port: PortId(1012),
+                    }),
+                },
+            ],
+            output: PortId(1014),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28517, 28635),
+            emit_participation: Some(BranchEmitParticipation::UserMatch),
+        }));
+        nodes.push(Behavior::Bind(BindNode {
+            id: NodeId(847),
+            name: "obligation_for_suite_claim".to_string(),
+            value: PortId(1014),
+            params: vec![PortId(1009)],
+            span: SourceSpan::new("src/v3/std/verification.dag", 28517, 28635),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(816),
+            id: NodeId(848),
             data: LiteralBits::String("+".to_string()),
-            output: PortId(983),
+            output: PortId(1017),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 886, 889),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(817),
+            id: NodeId(849),
             data: LiteralBits::String("-".to_string()),
-            output: PortId(984),
+            output: PortId(1018),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 905, 908),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(818),
+            id: NodeId(850),
             data: LiteralBits::String("*".to_string()),
-            output: PortId(985),
+            output: PortId(1019),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 924, 927),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(819),
+            id: NodeId(851),
             data: LiteralBits::String("/".to_string()),
-            output: PortId(986),
+            output: PortId(1020),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 943, 946),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(820),
-            input: PortId(982),
+            id: NodeId(852),
+            input: PortId(1016),
             paths: vec![
                 Path {
-                    body: NodeId(816),
-                    output: PortId(983),
+                    body: NodeId(848),
+                    output: PortId(1017),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Add".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 879, 882),
@@ -9307,8 +9649,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(817),
-                    output: PortId(984),
+                    body: NodeId(849),
+                    output: PortId(1018),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Sub".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 898, 901),
@@ -9316,8 +9658,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(818),
-                    output: PortId(985),
+                    body: NodeId(850),
+                    output: PortId(1019),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Mul".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 917, 920),
@@ -9325,8 +9667,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(819),
-                    output: PortId(986),
+                    body: NodeId(851),
+                    output: PortId(1020),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Div".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 936, 939),
@@ -9334,59 +9676,59 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
             ],
-            output: PortId(987),
+            output: PortId(1021),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 857, 954),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(821),
+            id: NodeId(853),
             data: LiteralBits::String("==".to_string()),
-            output: PortId(989),
+            output: PortId(1023),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1012, 1016),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(822),
+            id: NodeId(854),
             data: LiteralBits::String("!=".to_string()),
-            output: PortId(990),
+            output: PortId(1024),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1031, 1035),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(823),
+            id: NodeId(855),
             data: LiteralBits::String("<".to_string()),
-            output: PortId(991),
+            output: PortId(1025),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1050, 1053),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(824),
+            id: NodeId(856),
             data: LiteralBits::String("<=".to_string()),
-            output: PortId(992),
+            output: PortId(1026),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1068, 1072),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(825),
+            id: NodeId(857),
             data: LiteralBits::String(">".to_string()),
-            output: PortId(993),
+            output: PortId(1027),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1087, 1090),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(826),
+            id: NodeId(858),
             data: LiteralBits::String(">=".to_string()),
-            output: PortId(994),
+            output: PortId(1028),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1105, 1109),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(827),
-            input: PortId(988),
+            id: NodeId(859),
+            input: PortId(1022),
             paths: vec![
                 Path {
-                    body: NodeId(821),
-                    output: PortId(989),
+                    body: NodeId(853),
+                    output: PortId(1023),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Eq".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1006, 1008),
@@ -9394,8 +9736,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(822),
-                    output: PortId(990),
+                    body: NodeId(854),
+                    output: PortId(1024),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Ne".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1025, 1027),
@@ -9403,8 +9745,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(823),
-                    output: PortId(991),
+                    body: NodeId(855),
+                    output: PortId(1025),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Lt".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1044, 1046),
@@ -9412,8 +9754,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(824),
-                    output: PortId(992),
+                    body: NodeId(856),
+                    output: PortId(1026),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Le".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1062, 1064),
@@ -9421,8 +9763,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(825),
-                    output: PortId(993),
+                    body: NodeId(857),
+                    output: PortId(1027),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Gt".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1081, 1083),
@@ -9430,8 +9772,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(826),
-                    output: PortId(994),
+                    body: NodeId(858),
+                    output: PortId(1028),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Ge".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1099, 1101),
@@ -9439,31 +9781,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
             ],
-            output: PortId(995),
+            output: PortId(1029),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 985, 1117),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(828),
+            id: NodeId(860),
             data: LiteralBits::String("&&".to_string()),
-            output: PortId(997),
+            output: PortId(1031),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1179, 1183),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(829),
+            id: NodeId(861),
             data: LiteralBits::String("||".to_string()),
-            output: PortId(998),
+            output: PortId(1032),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1198, 1202),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(830),
-            input: PortId(996),
+            id: NodeId(862),
+            input: PortId(1030),
             paths: vec![
                 Path {
-                    body: NodeId(828),
-                    output: PortId(997),
+                    body: NodeId(860),
+                    output: PortId(1031),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "And".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1172, 1175),
@@ -9471,8 +9813,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(829),
-                    output: PortId(998),
+                    body: NodeId(861),
+                    output: PortId(1032),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Or".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1192, 1194),
@@ -9480,99 +9822,99 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
             ],
-            output: PortId(999),
+            output: PortId(1033),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1148, 1210),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(831),
-            input: PortId(981),
+            id: NodeId(863),
+            input: PortId(1015),
             paths: vec![
                 Path {
-                    body: NodeId(820),
-                    output: PortId(987),
+                    body: NodeId(852),
+                    output: PortId(1021),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Arithmetic".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 830, 847),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "arith".to_string(),
-                        payload_port: PortId(982),
+                        payload_port: PortId(1016),
                     }),
                 },
                 Path {
-                    body: NodeId(827),
-                    output: PortId(995),
+                    body: NodeId(859),
+                    output: PortId(1029),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Comparison".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 959, 975),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "comp".to_string(),
-                        payload_port: PortId(988),
+                        payload_port: PortId(1022),
                     }),
                 },
                 Path {
-                    body: NodeId(830),
-                    output: PortId(999),
+                    body: NodeId(862),
+                    output: PortId(1033),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Logical".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1122, 1138),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "logical".to_string(),
-                        payload_port: PortId(996),
+                        payload_port: PortId(1030),
                     }),
                 },
             ],
-            output: PortId(1000),
+            output: PortId(1034),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 815, 1214),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(832),
+            id: NodeId(864),
             name: "symbol".to_string(),
-            value: PortId(1000),
-            params: vec![PortId(981)],
+            value: PortId(1034),
+            params: vec![PortId(1015)],
             span: SourceSpan::new("src/v3/compiler/operators.dag", 815, 1214),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(833),
+            id: NodeId(865),
             data: LiteralBits::String("add".to_string()),
-            output: PortId(1003),
+            output: PortId(1037),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1341, 1346),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(834),
+            id: NodeId(866),
             data: LiteralBits::String("sub".to_string()),
-            output: PortId(1004),
+            output: PortId(1038),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1362, 1367),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(835),
+            id: NodeId(867),
             data: LiteralBits::String("mul".to_string()),
-            output: PortId(1005),
+            output: PortId(1039),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1383, 1388),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(836),
+            id: NodeId(868),
             data: LiteralBits::String("div".to_string()),
-            output: PortId(1006),
+            output: PortId(1040),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1404, 1409),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(837),
-            input: PortId(1002),
+            id: NodeId(869),
+            input: PortId(1036),
             paths: vec![
                 Path {
-                    body: NodeId(833),
-                    output: PortId(1003),
+                    body: NodeId(865),
+                    output: PortId(1037),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Add".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1334, 1337),
@@ -9580,8 +9922,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(834),
-                    output: PortId(1004),
+                    body: NodeId(866),
+                    output: PortId(1038),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Sub".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1355, 1358),
@@ -9589,8 +9931,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(835),
-                    output: PortId(1005),
+                    body: NodeId(867),
+                    output: PortId(1039),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Mul".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1376, 1379),
@@ -9598,8 +9940,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(836),
-                    output: PortId(1006),
+                    body: NodeId(868),
+                    output: PortId(1040),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Div".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1397, 1400),
@@ -9607,59 +9949,59 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
             ],
-            output: PortId(1007),
+            output: PortId(1041),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1312, 1417),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(838),
+            id: NodeId(870),
             data: LiteralBits::String("eq".to_string()),
-            output: PortId(1009),
+            output: PortId(1043),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1475, 1479),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(839),
+            id: NodeId(871),
             data: LiteralBits::String("ne".to_string()),
-            output: PortId(1010),
+            output: PortId(1044),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1494, 1498),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(840),
+            id: NodeId(872),
             data: LiteralBits::String("lt".to_string()),
-            output: PortId(1011),
+            output: PortId(1045),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1513, 1517),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(841),
+            id: NodeId(873),
             data: LiteralBits::String("le".to_string()),
-            output: PortId(1012),
+            output: PortId(1046),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1532, 1536),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(842),
+            id: NodeId(874),
             data: LiteralBits::String("gt".to_string()),
-            output: PortId(1013),
+            output: PortId(1047),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1551, 1555),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(843),
+            id: NodeId(875),
             data: LiteralBits::String("ge".to_string()),
-            output: PortId(1014),
+            output: PortId(1048),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1570, 1574),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(844),
-            input: PortId(1008),
+            id: NodeId(876),
+            input: PortId(1042),
             paths: vec![
                 Path {
-                    body: NodeId(838),
-                    output: PortId(1009),
+                    body: NodeId(870),
+                    output: PortId(1043),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Eq".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1469, 1471),
@@ -9667,8 +10009,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(839),
-                    output: PortId(1010),
+                    body: NodeId(871),
+                    output: PortId(1044),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Ne".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1488, 1490),
@@ -9676,8 +10018,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(840),
-                    output: PortId(1011),
+                    body: NodeId(872),
+                    output: PortId(1045),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Lt".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1507, 1509),
@@ -9685,8 +10027,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(841),
-                    output: PortId(1012),
+                    body: NodeId(873),
+                    output: PortId(1046),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Le".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1526, 1528),
@@ -9694,8 +10036,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(842),
-                    output: PortId(1013),
+                    body: NodeId(874),
+                    output: PortId(1047),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Gt".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1545, 1547),
@@ -9703,8 +10045,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(843),
-                    output: PortId(1014),
+                    body: NodeId(875),
+                    output: PortId(1048),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Ge".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1564, 1566),
@@ -9712,31 +10054,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
             ],
-            output: PortId(1015),
+            output: PortId(1049),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1448, 1582),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(845),
+            id: NodeId(877),
             data: LiteralBits::String("meet".to_string()),
-            output: PortId(1017),
+            output: PortId(1051),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1978, 1984),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(846),
+            id: NodeId(878),
             data: LiteralBits::String("join".to_string()),
-            output: PortId(1018),
+            output: PortId(1052),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1999, 2005),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(847),
-            input: PortId(1016),
+            id: NodeId(879),
+            input: PortId(1050),
             paths: vec![
                 Path {
-                    body: NodeId(845),
-                    output: PortId(1017),
+                    body: NodeId(877),
+                    output: PortId(1051),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "And".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1971, 1974),
@@ -9744,8 +10086,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
                 Path {
-                    body: NodeId(846),
-                    output: PortId(1018),
+                    body: NodeId(878),
+                    output: PortId(1052),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Or".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1993, 1995),
@@ -9753,104 +10095,104 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     binding: None,
                 },
             ],
-            output: PortId(1019),
+            output: PortId(1053),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1947, 2013),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(848),
-            input: PortId(1001),
+            id: NodeId(880),
+            input: PortId(1035),
             paths: vec![
                 Path {
-                    body: NodeId(837),
-                    output: PortId(1007),
+                    body: NodeId(869),
+                    output: PortId(1041),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Arithmetic".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1285, 1302),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "arith".to_string(),
-                        payload_port: PortId(1002),
+                        payload_port: PortId(1036),
                     }),
                 },
                 Path {
-                    body: NodeId(844),
-                    output: PortId(1015),
+                    body: NodeId(876),
+                    output: PortId(1049),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Comparison".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1422, 1438),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "comp".to_string(),
-                        payload_port: PortId(1008),
+                        payload_port: PortId(1042),
                     }),
                 },
                 Path {
-                    body: NodeId(847),
-                    output: PortId(1019),
+                    body: NodeId(879),
+                    output: PortId(1053),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Logical".to_string(),
                         span: SourceSpan::new("src/v3/compiler/operators.dag", 1921, 1937),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "logical".to_string(),
-                        payload_port: PortId(1016),
+                        payload_port: PortId(1050),
                     }),
                 },
             ],
-            output: PortId(1020),
+            output: PortId(1054),
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1270, 2017),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(849),
+            id: NodeId(881),
             name: "algebra_field_name".to_string(),
-            value: PortId(1020),
-            params: vec![PortId(1001)],
+            value: PortId(1054),
+            params: vec![PortId(1035)],
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1270, 2017),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(850),
+            id: NodeId(882),
             target: TransformTarget::Operator(OperatorKind::Comparison(ComparisonOp::Eq)),
-            inputs: vec![PortId(1021), PortId(1021)],
-            output: PortId(1022),
+            inputs: vec![PortId(1055), PortId(1055)],
+            output: PortId(1056),
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2673, 2714),
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(851),
+            id: NodeId(883),
             data: LiteralBits::String("GitHubActionsWorkflowStemSegment".to_string()),
-            output: PortId(1023),
+            output: PortId(1057),
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2673, 2714),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Value(ValueNode {
-            id: NodeId(852),
+            id: NodeId(884),
             data: LiteralBits::String("GitHubActionsWorkflowStemSegment".to_string()),
-            output: PortId(1024),
+            output: PortId(1058),
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2673, 2714),
             lane2_workflow: None,
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(853),
+            id: NodeId(885),
             target: TransformTarget::Operator(OperatorKind::Comparison(ComparisonOp::Eq)),
-            inputs: vec![PortId(1023), PortId(1024)],
-            output: PortId(1025),
+            inputs: vec![PortId(1057), PortId(1058)],
+            output: PortId(1059),
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2673, 2714),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(854),
+            id: NodeId(886),
             target: TransformTarget::Operator(OperatorKind::Logical(LogicalOp::And)),
-            inputs: vec![PortId(1022), PortId(1025)],
-            output: PortId(1026),
+            inputs: vec![PortId(1056), PortId(1059)],
+            output: PortId(1060),
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2673, 2714),
         }));
         nodes.push(Behavior::Bind(BindNode {
-            id: NodeId(855),
+            id: NodeId(887),
             name: "<registry-refinement:GitHubActionsWorkflowStemSegment>".to_string(),
-            value: PortId(1026),
-            params: vec![PortId(1021)],
+            value: PortId(1060),
+            params: vec![PortId(1055)],
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2673, 2714),
             lane2_workflow: None,
             emit_participation: None,
@@ -9862,7 +10204,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(2879);
+        let mut declarations = Vec::with_capacity(2899);
         declarations.push(Declaration {
             id: DeclarationId(0),
             name: Some("Classical".to_string()),
@@ -24070,11 +24412,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Empty".to_string(),
-                        ty: DeclarationId(1434),
+                        ty: DeclarationId(1448),
                     },
                     Field {
                         label: "Cons".to_string(),
-                        ty: DeclarationId(1436),
+                        ty: DeclarationId(1450),
                     },
                 ],
             },
@@ -24107,7 +24449,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1404),
+                output: DeclarationId(1418),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3273, 3284)),
             },
             type_params: vec![DeclarationId(688)],
@@ -24138,8 +24480,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(1405)],
-                output: DeclarationId(1406),
+                inputs: vec![DeclarationId(690), DeclarationId(1419)],
+                output: DeclarationId(1420),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3453, 3475)),
             },
             type_params: vec![DeclarationId(690)],
@@ -24171,7 +24513,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(1407),
+                output: DeclarationId(1421),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3570, 3590)),
             },
             type_params: vec![DeclarationId(692)],
@@ -24202,7 +24544,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(1408), DeclarationId(695), DeclarationId(1409)],
+                inputs: vec![DeclarationId(1422), DeclarationId(695), DeclarationId(1423)],
                 output: DeclarationId(695),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4203, 4307)),
             },
@@ -24248,7 +24590,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(1410), DeclarationId(698), DeclarationId(1411)],
+                inputs: vec![DeclarationId(1424), DeclarationId(698), DeclarationId(1425)],
                 output: DeclarationId(698),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4658, 4768)),
             },
@@ -24294,8 +24636,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(1412), DeclarationId(1413)],
-                output: DeclarationId(1414),
+                inputs: vec![DeclarationId(1426), DeclarationId(1427)],
+                output: DeclarationId(1428),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5386, 5414)),
             },
             type_params: vec![DeclarationId(700)],
@@ -24326,8 +24668,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(1415), DeclarationId(1416)],
-                output: DeclarationId(1417),
+                inputs: vec![DeclarationId(1429), DeclarationId(1430)],
+                output: DeclarationId(1431),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5721, 5778)),
             },
             type_params: vec![DeclarationId(702), DeclarationId(703)],
@@ -24372,8 +24714,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(1418), DeclarationId(1419)],
-                output: DeclarationId(1420),
+                inputs: vec![DeclarationId(1432), DeclarationId(1433)],
+                output: DeclarationId(1434),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5905, 5988)),
             },
             type_params: vec![DeclarationId(705)],
@@ -24404,8 +24746,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(1421), DeclarationId(1423)],
-                output: DeclarationId(1424),
+                inputs: vec![DeclarationId(1435), DeclarationId(1437)],
+                output: DeclarationId(1438),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6171, 6230)),
             },
             type_params: vec![DeclarationId(707), DeclarationId(708)],
@@ -24450,7 +24792,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(1425)],
+                inputs: vec![DeclarationId(1439)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6372, 6409)),
             },
@@ -24482,7 +24824,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(1426)],
+                inputs: vec![DeclarationId(1440)],
                 output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6605, 6671)),
             },
@@ -24553,8 +24895,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(1427)],
-                output: DeclarationId(1429),
+                inputs: vec![DeclarationId(1441)],
+                output: DeclarationId(1443),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7238, 7269)),
             },
             type_params: vec![DeclarationId(716)],
@@ -24585,8 +24927,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(1430), DeclarationId(93)],
-                output: DeclarationId(1432),
+                inputs: vec![DeclarationId(1444), DeclarationId(93)],
+                output: DeclarationId(1446),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7463, 7644)),
             },
             type_params: vec![DeclarationId(718)],
@@ -24617,7 +24959,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(1433), DeclarationId(720)],
+                inputs: vec![DeclarationId(1447), DeclarationId(720)],
                 output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 8205, 8332)),
             },
@@ -24712,7 +25054,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1437),
+                        ty: DeclarationId(1451),
                     },
                 ],
             },
@@ -24755,7 +25097,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1438),
+                        ty: DeclarationId(1452),
                     },
                 ],
             },
@@ -24790,11 +25132,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LiteralToken".to_string(),
-                        ty: DeclarationId(1453),
+                        ty: DeclarationId(1467),
                     },
                     Field {
                         label: "ParamToken".to_string(),
-                        ty: DeclarationId(1454),
+                        ty: DeclarationId(1468),
                     },
                 ],
             },
@@ -24814,7 +25156,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1455),
+                    ty: DeclarationId(1469),
                 }],
             },
             type_params: vec![],
@@ -24834,11 +25176,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ParsedSegmentTokens".to_string(),
-                        ty: DeclarationId(1457),
+                        ty: DeclarationId(1471),
                     },
                     Field {
                         label: "MalformedPathSegment".to_string(),
-                        ty: DeclarationId(1458),
+                        ty: DeclarationId(1472),
                     },
                 ],
             },
@@ -24859,11 +25201,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ParsedPathTemplate".to_string(),
-                        ty: DeclarationId(1459),
+                        ty: DeclarationId(1473),
                     },
                     Field {
                         label: "MalformedPathTemplate".to_string(),
-                        ty: DeclarationId(1460),
+                        ty: DeclarationId(1474),
                     },
                 ],
             },
@@ -24918,7 +25260,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(1439),
+                output: DeclarationId(1453),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 11761, 12044)),
             },
             type_params: vec![],
@@ -24938,15 +25280,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ReadEffect".to_string(),
-                        ty: DeclarationId(1461),
+                        ty: DeclarationId(1475),
                     },
                     Field {
                         label: "UpsertEffect".to_string(),
-                        ty: DeclarationId(1462),
+                        ty: DeclarationId(1476),
                     },
                     Field {
                         label: "DeleteEffect".to_string(),
-                        ty: DeclarationId(1463),
+                        ty: DeclarationId(1477),
                     },
                 ],
             },
@@ -24967,11 +25309,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CreateEffect".to_string(),
-                        ty: DeclarationId(1464),
+                        ty: DeclarationId(1478),
                     },
                     Field {
                         label: "AppendEffect".to_string(),
-                        ty: DeclarationId(1465),
+                        ty: DeclarationId(1479),
                     },
                 ],
             },
@@ -24992,11 +25334,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IsIdempotent".to_string(),
-                        ty: DeclarationId(1466),
+                        ty: DeclarationId(1480),
                     },
                     Field {
                         label: "IsBreaking".to_string(),
-                        ty: DeclarationId(1467),
+                        ty: DeclarationId(1481),
                     },
                 ],
             },
@@ -25017,11 +25359,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "PostAlways".to_string(),
-                        ty: DeclarationId(1468),
+                        ty: DeclarationId(1482),
                     },
                     Field {
                         label: "KeylessFallback".to_string(),
-                        ty: DeclarationId(1469),
+                        ty: DeclarationId(1483),
                     },
                 ],
             },
@@ -25042,15 +25384,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "PathParam".to_string(),
-                        ty: DeclarationId(1470),
+                        ty: DeclarationId(1484),
                     },
                     Field {
                         label: "InputField".to_string(),
-                        ty: DeclarationId(1471),
+                        ty: DeclarationId(1485),
                     },
                     Field {
                         label: "CompositeKey".to_string(),
-                        ty: DeclarationId(1473),
+                        ty: DeclarationId(1487),
                     },
                 ],
             },
@@ -25071,15 +25413,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LatticeEffect".to_string(),
-                        ty: DeclarationId(1474),
+                        ty: DeclarationId(1488),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(1475),
+                        ty: DeclarationId(1489),
                     },
                     Field {
                         label: "NonIdempotent".to_string(),
-                        ty: DeclarationId(1476),
+                        ty: DeclarationId(1490),
                     },
                 ],
             },
@@ -25161,15 +25503,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DerivedEffect".to_string(),
-                        ty: DeclarationId(1477),
+                        ty: DeclarationId(1491),
                     },
                     Field {
                         label: "UnknownHttpMethodInput".to_string(),
-                        ty: DeclarationId(1478),
+                        ty: DeclarationId(1492),
                     },
                     Field {
                         label: "MalformedPathInput".to_string(),
-                        ty: DeclarationId(1479),
+                        ty: DeclarationId(1493),
                     },
                 ],
             },
@@ -25190,11 +25532,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IdempotentComposition".to_string(),
-                        ty: DeclarationId(1480),
+                        ty: DeclarationId(1494),
                     },
                     Field {
                         label: "BrokenBy".to_string(),
-                        ty: DeclarationId(1482),
+                        ty: DeclarationId(1496),
                     },
                 ],
             },
@@ -25231,7 +25573,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(1440),
+                output: DeclarationId(1454),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20942, 20964)),
             },
             type_params: vec![],
@@ -25248,8 +25590,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(1441)],
-                output: DeclarationId(1443),
+                inputs: vec![DeclarationId(1455)],
+                output: DeclarationId(1457),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21058, 21151)),
             },
             type_params: vec![],
@@ -25266,8 +25608,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(1444)],
-                output: DeclarationId(1446),
+                inputs: vec![DeclarationId(1458)],
+                output: DeclarationId(1460),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21238, 21421)),
             },
             type_params: vec![],
@@ -25284,7 +25626,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(1447)],
+                inputs: vec![DeclarationId(1461)],
                 output: DeclarationId(746),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22311, 22434)),
             },
@@ -25349,19 +25691,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LinearEffect".to_string(),
-                        ty: DeclarationId(1484),
+                        ty: DeclarationId(1498),
                     },
                     Field {
                         label: "BranchEffect".to_string(),
-                        ty: DeclarationId(1486),
+                        ty: DeclarationId(1500),
                     },
                     Field {
                         label: "LoopEffect".to_string(),
-                        ty: DeclarationId(1487),
+                        ty: DeclarationId(1501),
                     },
                     Field {
                         label: "ParallelEffect".to_string(),
-                        ty: DeclarationId(1489),
+                        ty: DeclarationId(1503),
                     },
                 ],
             },
@@ -25411,11 +25753,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "WorkflowCompositionVerdict".to_string(),
-                        ty: DeclarationId(1490),
+                        ty: DeclarationId(1504),
                     },
                     Field {
                         label: "IdempotencyUnsupported".to_string(),
-                        ty: DeclarationId(1491),
+                        ty: DeclarationId(1505),
                     },
                 ],
             },
@@ -25454,23 +25796,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoWorkflowProjection".to_string(),
-                        ty: DeclarationId(1492),
+                        ty: DeclarationId(1506),
                     },
                     Field {
                         label: "NotParallelEffectRoot".to_string(),
-                        ty: DeclarationId(1493),
+                        ty: DeclarationId(1507),
                     },
                     Field {
                         label: "NonLinearParallelBranch".to_string(),
-                        ty: DeclarationId(1494),
+                        ty: DeclarationId(1508),
                     },
                     Field {
                         label: "PairwiseNonCommute".to_string(),
-                        ty: DeclarationId(1495),
+                        ty: DeclarationId(1509),
                     },
                     Field {
                         label: "LensSurfacePending".to_string(),
-                        ty: DeclarationId(1496),
+                        ty: DeclarationId(1510),
                     },
                 ],
             },
@@ -25520,11 +25862,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ParallelCompositionVerdict".to_string(),
-                        ty: DeclarationId(1497),
+                        ty: DeclarationId(1511),
                     },
                     Field {
                         label: "ParallelismUnsupported".to_string(),
-                        ty: DeclarationId(1498),
+                        ty: DeclarationId(1512),
                     },
                 ],
             },
@@ -25579,7 +25921,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(1448),
+                output: DeclarationId(1462),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29705, 30003)),
             },
             type_params: vec![],
@@ -25614,7 +25956,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(1449), DeclarationId(198)],
+                inputs: vec![DeclarationId(1463), DeclarationId(198)],
                 output: DeclarationId(738),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30474, 30626)),
             },
@@ -25632,7 +25974,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(1450), DeclarationId(198)],
+                inputs: vec![DeclarationId(1464), DeclarationId(198)],
                 output: DeclarationId(738),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30704, 30856)),
             },
@@ -25689,15 +26031,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Agrees".to_string(),
-                        ty: DeclarationId(1499),
+                        ty: DeclarationId(1513),
                     },
                     Field {
                         label: "Disagrees".to_string(),
-                        ty: DeclarationId(1500),
+                        ty: DeclarationId(1514),
                     },
                     Field {
                         label: "DerivationUnknown".to_string(),
-                        ty: DeclarationId(1501),
+                        ty: DeclarationId(1515),
                     },
                 ],
             },
@@ -25718,11 +26060,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ModifierNotDeclared".to_string(),
-                        ty: DeclarationId(1502),
+                        ty: DeclarationId(1516),
                     },
                     Field {
                         label: "ModifierDeclared".to_string(),
-                        ty: DeclarationId(1503),
+                        ty: DeclarationId(1517),
                     },
                 ],
             },
@@ -25860,8 +26202,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(1451)],
-                output: DeclarationId(1452),
+                inputs: vec![DeclarationId(1465)],
+                output: DeclarationId(1466),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 36638, 36908)),
             },
             type_params: vec![],
@@ -25954,15 +26296,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Uninferred".to_string(),
-                        ty: DeclarationId(1512),
+                        ty: DeclarationId(1526),
                     },
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(1513),
+                        ty: DeclarationId(1527),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(1514),
+                        ty: DeclarationId(1528),
                     },
                 ],
             },
@@ -25991,7 +26333,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "produced_by".to_string(),
-                        ty: DeclarationId(1515),
+                        ty: DeclarationId(1529),
                     },
                 ],
             },
@@ -26012,15 +26354,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LitInt".to_string(),
-                        ty: DeclarationId(1516),
+                        ty: DeclarationId(1530),
                     },
                     Field {
                         label: "LitBool".to_string(),
-                        ty: DeclarationId(1517),
+                        ty: DeclarationId(1531),
                     },
                     Field {
                         label: "LitString".to_string(),
-                        ty: DeclarationId(1518),
+                        ty: DeclarationId(1532),
                     },
                 ],
             },
@@ -26041,23 +26383,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1519),
+                        ty: DeclarationId(1533),
                     },
                     Field {
                         label: "UnresolvedIdentifier".to_string(),
-                        ty: DeclarationId(1520),
+                        ty: DeclarationId(1534),
                     },
                     Field {
                         label: "ResolvedByStructure".to_string(),
-                        ty: DeclarationId(1521),
+                        ty: DeclarationId(1535),
                     },
                     Field {
                         label: "ResolvedByName".to_string(),
-                        ty: DeclarationId(1522),
+                        ty: DeclarationId(1536),
                     },
                     Field {
                         label: "TypeParam".to_string(),
-                        ty: DeclarationId(1523),
+                        ty: DeclarationId(1537),
                     },
                 ],
             },
@@ -26078,15 +26420,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "OneUnit".to_string(),
-                        ty: DeclarationId(1524),
+                        ty: DeclarationId(1538),
                     },
                     Field {
                         label: "AdditionalUnit".to_string(),
-                        ty: DeclarationId(1525),
+                        ty: DeclarationId(1539),
                     },
                     Field {
                         label: "UnitCount".to_string(),
-                        ty: DeclarationId(1526),
+                        ty: DeclarationId(1540),
                     },
                 ],
             },
@@ -26107,11 +26449,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ZeroWidth".to_string(),
-                        ty: DeclarationId(1527),
+                        ty: DeclarationId(1541),
                     },
                     Field {
                         label: "PositiveWidth".to_string(),
-                        ty: DeclarationId(1528),
+                        ty: DeclarationId(1542),
                     },
                 ],
             },
@@ -26132,11 +26474,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "BoundedInterval".to_string(),
-                        ty: DeclarationId(1529),
+                        ty: DeclarationId(1543),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1530),
+                        ty: DeclarationId(1544),
                     },
                 ],
             },
@@ -26191,11 +26533,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "StaticBound".to_string(),
-                        ty: DeclarationId(1532),
+                        ty: DeclarationId(1546),
                     },
                     Field {
                         label: "PlatformDependent".to_string(),
-                        ty: DeclarationId(1533),
+                        ty: DeclarationId(1547),
                     },
                 ],
             },
@@ -26216,15 +26558,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Exact".to_string(),
-                        ty: DeclarationId(1534),
+                        ty: DeclarationId(1548),
                     },
                     Field {
                         label: "AtMostOne".to_string(),
-                        ty: DeclarationId(1535),
+                        ty: DeclarationId(1549),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1536),
+                        ty: DeclarationId(1550),
                     },
                 ],
             },
@@ -26320,27 +26662,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1537),
+                        ty: DeclarationId(1551),
                     },
                     Field {
                         label: "Reference".to_string(),
-                        ty: DeclarationId(1538),
+                        ty: DeclarationId(1552),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(1540),
+                        ty: DeclarationId(1554),
                     },
                     Field {
                         label: "List".to_string(),
-                        ty: DeclarationId(1542),
+                        ty: DeclarationId(1556),
                     },
                     Field {
                         label: "Map".to_string(),
-                        ty: DeclarationId(1544),
+                        ty: DeclarationId(1558),
                     },
                     Field {
                         label: "Variant".to_string(),
-                        ty: DeclarationId(1546),
+                        ty: DeclarationId(1560),
                     },
                 ],
             },
@@ -26361,23 +26703,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ValueBodyUnparsed".to_string(),
-                        ty: DeclarationId(1547),
+                        ty: DeclarationId(1561),
                     },
                     Field {
                         label: "ValueBodyStructural".to_string(),
-                        ty: DeclarationId(1549),
+                        ty: DeclarationId(1563),
                     },
                     Field {
                         label: "ValueBodyScalar".to_string(),
-                        ty: DeclarationId(1550),
+                        ty: DeclarationId(1564),
                     },
                     Field {
                         label: "ValueBodyList".to_string(),
-                        ty: DeclarationId(1552),
+                        ty: DeclarationId(1566),
                     },
                     Field {
                         label: "ValueBodyMap".to_string(),
-                        ty: DeclarationId(1554),
+                        ty: DeclarationId(1568),
                     },
                 ],
             },
@@ -26417,23 +26759,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UserDefined".to_string(),
-                        ty: DeclarationId(1555),
+                        ty: DeclarationId(1569),
                     },
                     Field {
                         label: "ExternalRealization".to_string(),
-                        ty: DeclarationId(1556),
+                        ty: DeclarationId(1570),
                     },
                     Field {
                         label: "Pending".to_string(),
-                        ty: DeclarationId(1557),
+                        ty: DeclarationId(1571),
                     },
                     Field {
                         label: "NoBody".to_string(),
-                        ty: DeclarationId(1558),
+                        ty: DeclarationId(1572),
                     },
                     Field {
                         label: "Unparsed".to_string(),
-                        ty: DeclarationId(1559),
+                        ty: DeclarationId(1573),
                     },
                 ],
             },
@@ -26454,27 +26796,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Atom".to_string(),
-                        ty: DeclarationId(1560),
+                        ty: DeclarationId(1574),
                     },
                     Field {
                         label: "Conj".to_string(),
-                        ty: DeclarationId(1562),
+                        ty: DeclarationId(1576),
                     },
                     Field {
                         label: "Disj".to_string(),
-                        ty: DeclarationId(1564),
+                        ty: DeclarationId(1578),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(1566),
+                        ty: DeclarationId(1580),
                     },
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1567),
+                        ty: DeclarationId(1581),
                     },
                     Field {
                         label: "Instantiation".to_string(),
-                        ty: DeclarationId(1569),
+                        ty: DeclarationId(1583),
                     },
                 ],
             },
@@ -26499,7 +26841,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(1570),
+                        ty: DeclarationId(1584),
                     },
                     Field {
                         label: "connective".to_string(),
@@ -26507,27 +26849,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(1571),
+                        ty: DeclarationId(1585),
                     },
                     Field {
                         label: "phantom_params".to_string(),
-                        ty: DeclarationId(1572),
+                        ty: DeclarationId(1586),
                     },
                     Field {
                         label: "meta_tag".to_string(),
-                        ty: DeclarationId(1573),
+                        ty: DeclarationId(1587),
                     },
                     Field {
                         label: "inhabits".to_string(),
-                        ty: DeclarationId(1574),
+                        ty: DeclarationId(1588),
                     },
                     Field {
                         label: "value_body".to_string(),
-                        ty: DeclarationId(1575),
+                        ty: DeclarationId(1589),
                     },
                     Field {
                         label: "nominal_opacity".to_string(),
-                        ty: DeclarationId(1576),
+                        ty: DeclarationId(1590),
                     },
                     Field {
                         label: "span".to_string(),
@@ -26576,7 +26918,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "permitted_accessors".to_string(),
-                    ty: DeclarationId(1577),
+                    ty: DeclarationId(1591),
                 }],
             },
             type_params: vec![],
@@ -26596,19 +26938,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Add".to_string(),
-                        ty: DeclarationId(1578),
+                        ty: DeclarationId(1592),
                     },
                     Field {
                         label: "Sub".to_string(),
-                        ty: DeclarationId(1579),
+                        ty: DeclarationId(1593),
                     },
                     Field {
                         label: "Mul".to_string(),
-                        ty: DeclarationId(1580),
+                        ty: DeclarationId(1594),
                     },
                     Field {
                         label: "Div".to_string(),
-                        ty: DeclarationId(1581),
+                        ty: DeclarationId(1595),
                     },
                 ],
             },
@@ -26629,27 +26971,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(1582),
+                        ty: DeclarationId(1596),
                     },
                     Field {
                         label: "Ne".to_string(),
-                        ty: DeclarationId(1583),
+                        ty: DeclarationId(1597),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(1584),
+                        ty: DeclarationId(1598),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(1585),
+                        ty: DeclarationId(1599),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(1586),
+                        ty: DeclarationId(1600),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(1587),
+                        ty: DeclarationId(1601),
                     },
                 ],
             },
@@ -26695,11 +27037,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "And".to_string(),
-                        ty: DeclarationId(1588),
+                        ty: DeclarationId(1602),
                     },
                     Field {
                         label: "Or".to_string(),
-                        ty: DeclarationId(1589),
+                        ty: DeclarationId(1603),
                     },
                 ],
             },
@@ -26720,15 +27062,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Arithmetic".to_string(),
-                        ty: DeclarationId(1590),
+                        ty: DeclarationId(1604),
                     },
                     Field {
                         label: "Comparison".to_string(),
-                        ty: DeclarationId(1591),
+                        ty: DeclarationId(1605),
                     },
                     Field {
                         label: "Logical".to_string(),
-                        ty: DeclarationId(1592),
+                        ty: DeclarationId(1606),
                     },
                 ],
             },
@@ -26749,19 +27091,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Callable".to_string(),
-                        ty: DeclarationId(1593),
+                        ty: DeclarationId(1607),
                     },
                     Field {
                         label: "UnresolvedFieldProject".to_string(),
-                        ty: DeclarationId(1594),
+                        ty: DeclarationId(1608),
                     },
                     Field {
                         label: "ResolvedFieldProject".to_string(),
-                        ty: DeclarationId(1595),
+                        ty: DeclarationId(1609),
                     },
                     Field {
                         label: "Operator".to_string(),
-                        ty: DeclarationId(1596),
+                        ty: DeclarationId(1610),
                     },
                 ],
             },
@@ -26782,11 +27124,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UnresolvedVariant".to_string(),
-                        ty: DeclarationId(1597),
+                        ty: DeclarationId(1611),
                     },
                     Field {
                         label: "ResolvedVariant".to_string(),
-                        ty: DeclarationId(1598),
+                        ty: DeclarationId(1612),
                     },
                 ],
             },
@@ -26844,7 +27186,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "binding".to_string(),
-                        ty: DeclarationId(1599),
+                        ty: DeclarationId(1613),
                     },
                 ],
             },
@@ -26980,11 +27322,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "members".to_string(),
-                        ty: DeclarationId(1600),
+                        ty: DeclarationId(1614),
                     },
                     Field {
                         label: "intra_cluster_calls".to_string(),
-                        ty: DeclarationId(1601),
+                        ty: DeclarationId(1615),
                     },
                 ],
             },
@@ -27005,11 +27347,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1602),
+                        ty: DeclarationId(1616),
                     },
                     Field {
                         label: "Descent".to_string(),
-                        ty: DeclarationId(1603),
+                        ty: DeclarationId(1617),
                     },
                 ],
             },
@@ -27064,7 +27406,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1604),
+                        ty: DeclarationId(1618),
                     },
                 ],
             },
@@ -27093,7 +27435,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1605),
+                        ty: DeclarationId(1619),
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -27121,7 +27463,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserMatch".to_string(),
-                    ty: DeclarationId(1606),
+                    ty: DeclarationId(1620),
                 }],
             },
             type_params: vec![],
@@ -27149,7 +27491,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "paths".to_string(),
-                        ty: DeclarationId(1607),
+                        ty: DeclarationId(1621),
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -27161,7 +27503,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1608),
+                        ty: DeclarationId(1622),
                     },
                 ],
             },
@@ -27226,7 +27568,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserCallable".to_string(),
-                    ty: DeclarationId(1609),
+                    ty: DeclarationId(1623),
                 }],
             },
             type_params: vec![],
@@ -27258,7 +27600,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(1610),
+                        ty: DeclarationId(1624),
                     },
                     Field {
                         label: "span".to_string(),
@@ -27266,11 +27608,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1611),
+                        ty: DeclarationId(1625),
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1612),
+                        ty: DeclarationId(1626),
                     },
                 ],
             },
@@ -27291,23 +27633,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Value".to_string(),
-                        ty: DeclarationId(1613),
+                        ty: DeclarationId(1627),
                     },
                     Field {
                         label: "Transform".to_string(),
-                        ty: DeclarationId(1614),
+                        ty: DeclarationId(1628),
                     },
                     Field {
                         label: "Branch".to_string(),
-                        ty: DeclarationId(1615),
+                        ty: DeclarationId(1629),
                     },
                     Field {
                         label: "Loop".to_string(),
-                        ty: DeclarationId(1616),
+                        ty: DeclarationId(1630),
                     },
                     Field {
                         label: "Bind".to_string(),
-                        ty: DeclarationId(1617),
+                        ty: DeclarationId(1631),
                     },
                 ],
             },
@@ -27328,19 +27670,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "declarations".to_string(),
-                        ty: DeclarationId(1618),
+                        ty: DeclarationId(1632),
                     },
                     Field {
                         label: "nodes".to_string(),
-                        ty: DeclarationId(1619),
+                        ty: DeclarationId(1633),
                     },
                     Field {
                         label: "ports".to_string(),
-                        ty: DeclarationId(1620),
+                        ty: DeclarationId(1634),
                     },
                     Field {
                         label: "clusters".to_string(),
-                        ty: DeclarationId(1621),
+                        ty: DeclarationId(1635),
                     },
                 ],
             },
@@ -27380,15 +27722,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "accessor".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                     Field {
                         label: "realization".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                 ],
             },
@@ -27407,7 +27749,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(1504),
+                output: DeclarationId(1518),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22297,
@@ -27429,7 +27771,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(1505),
+                output: DeclarationId(1519),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22355,
@@ -27451,7 +27793,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(1506),
+                output: DeclarationId(1520),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22430,
@@ -27473,7 +27815,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(1507),
+                output: DeclarationId(1521),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22819,
@@ -27495,7 +27837,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(1508),
+                output: DeclarationId(1522),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     23694,
@@ -27517,7 +27859,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(1509),
+                output: DeclarationId(1523),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     24020,
@@ -27541,15 +27883,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "SingleRoot".to_string(),
-                        ty: DeclarationId(1622),
+                        ty: DeclarationId(1636),
                     },
                     Field {
                         label: "NoRoot".to_string(),
-                        ty: DeclarationId(1623),
+                        ty: DeclarationId(1637),
                     },
                     Field {
                         label: "AmbiguousRoot".to_string(),
-                        ty: DeclarationId(1625),
+                        ty: DeclarationId(1639),
                     },
                 ],
             },
@@ -27590,7 +27932,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(1510),
+                output: DeclarationId(1524),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     28025,
@@ -27612,7 +27954,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(1511),
+                output: DeclarationId(1525),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     28110,
@@ -27635,7 +27977,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "decl".to_string(),
-                    ty: DeclarationId(1300),
+                    ty: DeclarationId(1314),
                 }],
             },
             type_params: vec![],
@@ -27650,20 +27992,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(842),
-            name: Some("CollectionSizeEffect".to_string()),
+            name: Some("AnthropicChatMessage".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "ShrinkEffect".to_string(),
-                        ty: DeclarationId(1650),
-                    },
-                    Field {
-                        label: "ProjectionEffect".to_string(),
-                        ty: DeclarationId(1651),
+                        label: "UserMessage".to_string(),
+                        ty: DeclarationId(1641),
                     },
                     Field {
-                        label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(1652),
+                        label: "AssistantMessage".to_string(),
+                        ty: DeclarationId(1643),
                     },
                 ],
             },
@@ -27675,28 +28013,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/algebra.dag", 4923, 5005),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2660, 2822),
         });
         declarations.push(Declaration {
             id: DeclarationId(843),
-            name: Some("CostShape".to_string()),
+            name: Some("ImageSource".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "ShapeConstant".to_string(),
-                        ty: DeclarationId(1653),
-                    },
-                    Field {
-                        label: "ShapeLinearScan".to_string(),
-                        ty: DeclarationId(1654),
-                    },
-                    Field {
-                        label: "ShapeIterateBody".to_string(),
-                        ty: DeclarationId(1655),
+                        label: "Base64Image".to_string(),
+                        ty: DeclarationId(1644),
                     },
                     Field {
-                        label: "ShapeSortBody".to_string(),
-                        ty: DeclarationId(1656),
+                        label: "UrlImage".to_string(),
+                        ty: DeclarationId(1645),
                     },
                 ],
             },
@@ -27708,32 +28038,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/algebra.dag", 5836, 5927),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3190, 3305),
         });
         declarations.push(Declaration {
             id: DeclarationId(844),
-            name: Some("MethodContract".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "algebra_id".to_string(),
-                        ty: DeclarationId(723),
-                    },
-                    Field {
-                        label: "method_id".to_string(),
-                        ty: DeclarationId(723),
-                    },
-                    Field {
-                        label: "size_effect".to_string(),
-                        ty: DeclarationId(1657),
-                    },
+            name: Some("ContentBlock".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "cost_shape".to_string(),
-                        ty: DeclarationId(1658),
+                        label: "TextContent".to_string(),
+                        ty: DeclarationId(1646),
                     },
                     Field {
-                        label: "callback_element_position".to_string(),
-                        ty: DeclarationId(1659),
+                        label: "ImageContent".to_string(),
+                        ty: DeclarationId(1647),
                     },
                 ],
             },
@@ -27745,22 +28063,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/algebra.dag", 6688, 6862),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3546, 3637),
         });
         declarations.push(Declaration {
             id: DeclarationId(845),
-            name: Some("SizeVariable".to_string()),
+            name: Some("CacheControl".to_string()),
             connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "source_port".to_string(),
-                        ty: DeclarationId(722),
-                    },
-                    Field {
-                        label: "display_name".to_string(),
-                        ty: DeclarationId(1660),
-                    },
-                ],
+                children: vec![Field {
+                    label: "type".to_string(),
+                    ty: DeclarationId(230),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -27770,15 +28082,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/algebra.dag", 7371, 7438),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3804, 3840),
         });
         declarations.push(Declaration {
             id: DeclarationId(846),
-            name: Some("unnamed_size_variable".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(722)],
-                output: DeclarationId(845),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 7502, 7534)),
+            name: Some("AnthropicSearchResultCitationsConfig".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "enabled".to_string(),
+                    ty: DeclarationId(128),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -27788,15 +28101,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 7440, 7534),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3937, 3998),
         });
         declarations.push(Declaration {
             id: DeclarationId(847),
-            name: Some("size_variable_eq".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(845), DeclarationId(845)],
-                output: DeclarationId(128),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(178))),
+            name: Some("AnthropicToolResultContent".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "ToolResultText".to_string(),
+                        ty: DeclarationId(1648),
+                    },
+                    Field {
+                        label: "ToolResultBlocks".to_string(),
+                        ty: DeclarationId(1650),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -27806,22 +28126,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/algebra.dag", 7536, 7632),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4296, 4407),
         });
         declarations.push(Declaration {
             id: DeclarationId(848),
-            name: Some("DegreeAtLeastTwo".to_string()),
+            name: Some("AnthropicToolResultWireTextTag".to_string()),
             connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "DegreeTwo".to_string(),
-                        ty: DeclarationId(1661),
-                    },
-                    Field {
-                        label: "DegreeSuccessor".to_string(),
-                        ty: DeclarationId(1662),
-                    },
-                ],
+                variants: vec![Field {
+                    label: "Text".to_string(),
+                    ty: DeclarationId(1651),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -27831,65 +28145,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/algebra.dag", 8379, 8465),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5576, 5623),
         });
         declarations.push(Declaration {
             id: DeclarationId(849),
-            name: Some("SymbolicCost".to_string()),
+            name: Some("AnthropicPlainTextDocumentMediaType".to_string()),
             connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "ConstantCost".to_string(),
-                        ty: DeclarationId(1663),
-                    },
-                    Field {
-                        label: "LinearCost".to_string(),
-                        ty: DeclarationId(1664),
-                    },
-                    Field {
-                        label: "PolynomialCost".to_string(),
-                        ty: DeclarationId(1665),
-                    },
-                    Field {
-                        label: "ProductCost".to_string(),
-                        ty: DeclarationId(1667),
-                    },
-                    Field {
-                        label: "SumCost".to_string(),
-                        ty: DeclarationId(1669),
-                    },
-                    Field {
-                        label: "LogCost".to_string(),
-                        ty: DeclarationId(1670),
-                    },
-                    Field {
-                        label: "UnknownCost".to_string(),
-                        ty: DeclarationId(1671),
-                    },
-                ],
+                variants: vec![Field {
+                    label: "TextPlain".to_string(),
+                    ty: DeclarationId(1652),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: Some(DeclarationId(1672)),
+            inhabits: None,
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 9452, 9761),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5704, 5761),
         });
         declarations.push(Declaration {
             id: DeclarationId(850),
-            name: Some("DominateScanAcc".to_string()),
+            name: Some("AnthropicToolResultTextBlock".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "any".to_string(),
-                        ty: DeclarationId(128),
+                        label: "type".to_string(),
+                        ty: DeclarationId(848),
                     },
                     Field {
-                        label: "pivot".to_string(),
-                        ty: DeclarationId(849),
+                        label: "text".to_string(),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -27901,15 +28189,34 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 10167, 10225),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5852, 5943),
         });
         declarations.push(Declaration {
             id: DeclarationId(851),
-            name: Some("dominate_scan_init".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849)],
-                output: DeclarationId(850),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(181))),
+            name: Some("AnthropicToolResultBlock".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "AnthropicTextBlock".to_string(),
+                        ty: DeclarationId(1653),
+                    },
+                    Field {
+                        label: "AnthropicImageBlock".to_string(),
+                        ty: DeclarationId(1654),
+                    },
+                    Field {
+                        label: "AnthropicDocumentBlock".to_string(),
+                        ty: DeclarationId(1655),
+                    },
+                    Field {
+                        label: "AnthropicSearchResultBlock".to_string(),
+                        ty: DeclarationId(1659),
+                    },
+                    Field {
+                        label: "AnthropicToolReferenceBlock".to_string(),
+                        ty: DeclarationId(1660),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -27919,15 +28226,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 10227, 10322),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5945, 6418),
         });
         declarations.push(Declaration {
             id: DeclarationId(852),
-            name: Some("miss_symbolic_cost_lookup".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1626),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 10963, 10973)),
+            name: Some("AnthropicToolResultPlainTextDocumentSource".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "type".to_string(),
+                        ty: DeclarationId(848),
+                    },
+                    Field {
+                        label: "media_type".to_string(),
+                        ty: DeclarationId(849),
+                    },
+                    Field {
+                        label: "document_data".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -27937,15 +28255,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 10908, 10973),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6420, 6645),
         });
         declarations.push(Declaration {
             id: DeclarationId(853),
-            name: Some("hit_symbolic_cost_lookup".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849)],
-                output: DeclarationId(1627),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 11047, 11062)),
+            name: Some("AnthropicUserContentBlock".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "UserTextBlock".to_string(),
+                        ty: DeclarationId(1661),
+                    },
+                    Field {
+                        label: "UserToolResultBlock".to_string(),
+                        ty: DeclarationId(1664),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -27955,15 +28280,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 10975, 11062),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6891, 7085),
         });
         declarations.push(Declaration {
             id: DeclarationId(854),
-            name: Some("two_terms".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849), DeclarationId(849)],
-                output: DeclarationId(1628),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(185))),
+            name: Some("AnthropicAssistantContentBlock".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "AssistantTextBlock".to_string(),
+                        ty: DeclarationId(1665),
+                    },
+                    Field {
+                        label: "AssistantToolUseBlock".to_string(),
+                        ty: DeclarationId(1666),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -27973,141 +28305,42 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 11064, 11539),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7492, 7658),
         });
         declarations.push(Declaration {
             id: DeclarationId(855),
-            name: Some("many_terms".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849), DeclarationId(849), DeclarationId(1629)],
-                output: DeclarationId(1630),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(187))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 11541, 11726),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(856),
-            name: Some("reject_all_symbolic_costs".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849)],
-                output: DeclarationId(128),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(192))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 11728, 11856),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(857),
-            name: Some("degree_raw".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(848)],
-                output: DeclarationId(93),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(200))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 11858, 12011),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(858),
-            name: Some("sequential".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849), DeclarationId(849)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(204))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 12247, 12350),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(859),
-            name: Some("iterate".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849), DeclarationId(849)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(208))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 12536, 12654),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(860),
-            name: Some("max_path_step".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849), DeclarationId(849)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(212))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 13514, 13681),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(861),
-            name: Some("keep_or_sum".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849), DeclarationId(849)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(216))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 13683, 13841),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(862),
-            name: Some("max_path".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1631)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(220))),
+            name: Some("AnthropicStopReason".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "EndTurn".to_string(),
+                        ty: DeclarationId(1667),
+                    },
+                    Field {
+                        label: "MaxTokens".to_string(),
+                        ty: DeclarationId(1668),
+                    },
+                    Field {
+                        label: "StopSequence".to_string(),
+                        ty: DeclarationId(1669),
+                    },
+                    Field {
+                        label: "ToolUse".to_string(),
+                        ty: DeclarationId(1670),
+                    },
+                    Field {
+                        label: "PauseTurn".to_string(),
+                        ty: DeclarationId(1671),
+                    },
+                    Field {
+                        label: "Refusal".to_string(),
+                        ty: DeclarationId(1672),
+                    },
+                    Field {
+                        label: "ModelContextWindowExceeded".to_string(),
+                        ty: DeclarationId(1673),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28117,15 +28350,34 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 14143, 14245),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7987, 8123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(863),
-            name: Some("dominates".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849), DeclarationId(849)],
-                output: DeclarationId(128),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(273))),
+            id: DeclarationId(856),
+            name: Some("AnthropicMessages200Citation".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "CharLocation".to_string(),
+                        ty: DeclarationId(1676),
+                    },
+                    Field {
+                        label: "PageLocation".to_string(),
+                        ty: DeclarationId(1679),
+                    },
+                    Field {
+                        label: "ContentBlockLocation".to_string(),
+                        ty: DeclarationId(1682),
+                    },
+                    Field {
+                        label: "WebSearchResultLocation".to_string(),
+                        ty: DeclarationId(1684),
+                    },
+                    Field {
+                        label: "SearchResultLocation".to_string(),
+                        ty: DeclarationId(1686),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28135,15 +28387,38 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 15113, 17198),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8325, 9071),
         });
         declarations.push(Declaration {
-            id: DeclarationId(864),
-            name: Some("same_size_variable".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(845), DeclarationId(845)],
-                output: DeclarationId(128),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(275))),
+            id: DeclarationId(857),
+            name: Some("AnthropicMessages200ContentBlock".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "MessagesTextBlock".to_string(),
+                        ty: DeclarationId(1689),
+                    },
+                    Field {
+                        label: "MessagesThinkingBlock".to_string(),
+                        ty: DeclarationId(1690),
+                    },
+                    Field {
+                        label: "MessagesRedactedThinkingBlock".to_string(),
+                        ty: DeclarationId(1691),
+                    },
+                    Field {
+                        label: "MessagesToolUseBlock".to_string(),
+                        ty: DeclarationId(1693),
+                    },
+                    Field {
+                        label: "MessagesServerToolUseBlock".to_string(),
+                        ty: DeclarationId(1695),
+                    },
+                    Field {
+                        label: "MessagesWebSearchToolResultBlock".to_string(),
+                        ty: DeclarationId(1697),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28153,44 +28428,44 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 17200, 17290),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9608, 10136),
         });
         declarations.push(Declaration {
-            id: DeclarationId(865),
-            name: Some("AsymptoticClass".to_string()),
+            id: DeclarationId(858),
+            name: Some("AnthropicServerToolName".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "ClassConstant".to_string(),
-                        ty: DeclarationId(1673),
+                        label: "WebSearch".to_string(),
+                        ty: DeclarationId(1698),
                     },
                     Field {
-                        label: "ClassLog".to_string(),
-                        ty: DeclarationId(1674),
+                        label: "WebFetch".to_string(),
+                        ty: DeclarationId(1699),
                     },
                     Field {
-                        label: "ClassLinear".to_string(),
-                        ty: DeclarationId(1675),
+                        label: "CodeExecution".to_string(),
+                        ty: DeclarationId(1700),
                     },
                     Field {
-                        label: "ClassLinearithmic".to_string(),
-                        ty: DeclarationId(1676),
+                        label: "BashCodeExecution".to_string(),
+                        ty: DeclarationId(1701),
                     },
                     Field {
-                        label: "ClassQuadratic".to_string(),
-                        ty: DeclarationId(1677),
+                        label: "TextEditorCodeExecution".to_string(),
+                        ty: DeclarationId(1702),
                     },
                     Field {
-                        label: "ClassPolynomial".to_string(),
-                        ty: DeclarationId(1678),
+                        label: "ToolSearchToolRegex".to_string(),
+                        ty: DeclarationId(1703),
                     },
                     Field {
-                        label: "ClassExponential".to_string(),
-                        ty: DeclarationId(1679),
+                        label: "ToolSearchToolBm25".to_string(),
+                        ty: DeclarationId(1704),
                     },
                     Field {
-                        label: "ClassUnknown".to_string(),
-                        ty: DeclarationId(1680),
+                        label: "Advisor".to_string(),
+                        ty: DeclarationId(1705),
                     },
                 ],
             },
@@ -28198,127 +28473,38 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: Some(DeclarationId(1681)),
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 18077, 18318),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(866),
-            name: Some("asymptotic_dominates".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(865), DeclarationId(865)],
-                output: DeclarationId(128),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(345))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 18320, 20588),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(867),
-            name: Some("meet_asymptotic_class".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(865), DeclarationId(865)],
-                output: DeclarationId(865),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(348))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 20590, 20721),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(868),
-            name: Some("join_asymptotic_class".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(865), DeclarationId(865)],
-                output: DeclarationId(865),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(351))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 20723, 20854),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(869),
-            name: Some("classify_symbolic_cost".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849)],
-                output: DeclarationId(865),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 20921, 20954)),
-            },
-            type_params: vec![],
-            phantom_params: 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", 20856, 20954),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(870),
-            name: Some("normalize".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(360))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 21828, 22193),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(871),
-            name: Some("nsl_to_list".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1632)],
-                output: DeclarationId(1633),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(366))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 22195, 22324),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10324, 10506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(872),
-            name: Some("drop_additive_zero".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1634)],
-                output: DeclarationId(1635),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(379))),
+            id: DeclarationId(859),
+            name: Some("AnthropicMessages200Usage".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "input_tokens".to_string(),
+                        ty: DeclarationId(93),
+                    },
+                    Field {
+                        label: "output_tokens".to_string(),
+                        ty: DeclarationId(93),
+                    },
+                    Field {
+                        label: "cache_creation_input_tokens".to_string(),
+                        ty: DeclarationId(1706),
+                    },
+                    Field {
+                        label: "cache_read_input_tokens".to_string(),
+                        ty: DeclarationId(1707),
+                    },
+                    Field {
+                        label: "service_tier".to_string(),
+                        ty: DeclarationId(1708),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28328,15 +28514,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/algebra.dag", 22501, 22793),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10622, 10837),
         });
         declarations.push(Declaration {
-            id: DeclarationId(873),
-            name: Some("collapse_on_multiplicative_zero".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1636)],
-                output: DeclarationId(1637),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(386))),
+            id: DeclarationId(860),
+            name: Some("AnthropicMessages200Role".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![Field {
+                    label: "Assistant".to_string(),
+                    ty: DeclarationId(1709),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28346,15 +28533,50 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 23002, 23165),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11158, 11201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(874),
-            name: Some("any_zero".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1638)],
-                output: DeclarationId(128),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(395))),
+            id: DeclarationId(861),
+            name: Some("AnthropicMessages200Body".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "id".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "type".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "role".to_string(),
+                        ty: DeclarationId(860),
+                    },
+                    Field {
+                        label: "content".to_string(),
+                        ty: DeclarationId(1710),
+                    },
+                    Field {
+                        label: "model".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "stop_reason".to_string(),
+                        ty: DeclarationId(855),
+                    },
+                    Field {
+                        label: "stop_sequence".to_string(),
+                        ty: DeclarationId(1711),
+                    },
+                    Field {
+                        label: "usage".to_string(),
+                        ty: DeclarationId(859),
+                    },
+                    Field {
+                        label: "container".to_string(),
+                        ty: DeclarationId(1712),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28364,15 +28586,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 23167, 23332),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11548, 11879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(875),
-            name: Some("drop_multiplicative_one".to_string()),
+            id: DeclarationId(862),
+            name: Some("anthropic_messages".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1639)],
-                output: DeclarationId(1640),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(408))),
+                inputs: vec![
+                    DeclarationId(147),
+                    DeclarationId(230),
+                    DeclarationId(1713),
+                    DeclarationId(93),
+                    DeclarationId(1714),
+                    DeclarationId(1715),
+                ],
+                output: DeclarationId(861),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/anthropic_messages.dag",
+                    4627,
+                    4656,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28382,15 +28615,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 23490, 23796),
+            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4419, 4656),
         });
         declarations.push(Declaration {
-            id: DeclarationId(876),
-            name: Some("is_zero_constant".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849)],
-                output: DeclarationId(128),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(418))),
+            id: DeclarationId(863),
+            name: Some("BinShim".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "entrypoint_name".to_string(),
+                        ty: DeclarationId(151),
+                    },
+                    Field {
+                        label: "description".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "entry".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28400,15 +28644,34 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 23798, 24052),
+            span: SourceSpan::new("src/v3/std/bin_shim.dag", 801, 894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(877),
-            name: Some("is_one_constant".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849)],
-                output: DeclarationId(128),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(428))),
+            id: DeclarationId(864),
+            name: Some("BootstrapAuthority".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "StdAuthority".to_string(),
+                        ty: DeclarationId(1716),
+                    },
+                    Field {
+                        label: "V3StdAuthority".to_string(),
+                        ty: DeclarationId(1717),
+                    },
+                    Field {
+                        label: "V3SpecAuthority".to_string(),
+                        ty: DeclarationId(1718),
+                    },
+                    Field {
+                        label: "CompilerAuthority".to_string(),
+                        ty: DeclarationId(1719),
+                    },
+                    Field {
+                        label: "ExtdepsFixtureAuthority".to_string(),
+                        ty: DeclarationId(1720),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28418,15 +28681,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 24054, 24307),
+            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 985, 1114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(878),
-            name: Some("reduce_sum".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1641)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(440))),
+            id: DeclarationId(865),
+            name: Some("BootstrapAuthoritySet".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(137),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(864),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28436,51 +28707,526 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 25092, 25363),
+            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1299, 1359),
         });
         declarations.push(Declaration {
-            id: DeclarationId(879),
-            name: Some("wrap_sum".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1642)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(452))),
+            id: DeclarationId(866),
+            name: Some("bootstrap_authority".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(865),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(865)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 25365, 25640),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(880),
-            name: Some("reduce_product".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1643)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(469))),
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Map(
+                FieldMap::from_entries(vec![
+                    (
+                        "dsl/std/logic.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1716),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/bit.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1716),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/error_primitives.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1716),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/algebra.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1716),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/magnitude.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1716),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/machine_constraints.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1716),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/nat.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1716),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/integer.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1716),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/rational.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1716),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/float.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1716),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/types.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1716),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/string_type.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1716),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/unicode.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1716),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/render_repeat_string_bootstrap.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1716),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/methods.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1716),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/std/serialization.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1716),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/algebra.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/anthropic_messages.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/anthropic_operations.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/anthropic_schema.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/approximate_field.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/bin_shim.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/bootstrap_authority.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/bridge_ledger.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/clean_emission.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/computation.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/computation_model.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/coproduct_projection.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/cross_target_coverage.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/diagnostics.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/dimensions.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/effects.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/emission_provenance.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/emit_model.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/extdeps_bootstrap_fixtures.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/go_method_template_contracts.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/induction.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/integer_diagnostic_order.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/lens.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/lens_application.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/list.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/lookup.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/methods.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/parse_surface.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/python_method_template_contracts.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/resources.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/runtime.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/rust_method_template_contracts.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/services.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/substrate.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/substrate_minimal.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/termination.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/timing_lens.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/t_ci_workflow_as_data_demo.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/tokenize.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/verification.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/workflows.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1717),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/spec/v3_l1.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1718),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/spec/go.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1718),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/spec/python.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1718),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/spec/rust.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1718),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/compiler/pipeline.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1719),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/compiler/operators.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1719),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/compiler/regen.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1719),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/extdeps/languages/rust/primitives.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1720),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/extdeps/cron_schedule_model.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1720),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/extdeps/github/github.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1720),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/extdeps/github/actions.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1720),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "dsl/extdeps/github/ci.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1720),
+                            payload: vec![],
+                        },
+                    ),
+                ])
+                .expect("ValueBody::Map"),
+            )),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 25825, 26246),
+            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1361, 4934),
         });
         declarations.push(Declaration {
-            id: DeclarationId(881),
-            name: Some("combine_binary_product".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849), DeclarationId(849)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(478))),
+            id: DeclarationId(867),
+            name: Some("BridgeStatus".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "Retired".to_string(),
+                        ty: DeclarationId(1721),
+                    },
+                    Field {
+                        label: "Open".to_string(),
+                        ty: DeclarationId(1722),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28490,15 +29236,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/algebra.dag", 26411, 26798),
+            span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4697, 4735),
         });
         declarations.push(Declaration {
-            id: DeclarationId(882),
-            name: Some("combine_linear_with".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(845), DeclarationId(849), DeclarationId(849)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(487))),
+            id: DeclarationId(868),
+            name: Some("BridgeLedgerRef".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "decl".to_string(),
+                    ty: DeclarationId(1314),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28508,20 +29255,30 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 26800, 27209),
+            span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 5699, 5746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(883),
-            name: Some("collapse_linear_square".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![
-                    DeclarationId(845),
-                    DeclarationId(845),
-                    DeclarationId(849),
-                    DeclarationId(849),
+            id: DeclarationId(869),
+            name: Some("BridgeLedgerRow".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "name".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "owner".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "status".to_string(),
+                        ty: DeclarationId(867),
+                    },
+                    Field {
+                        label: "authority".to_string(),
+                        ty: DeclarationId(230),
+                    },
                 ],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(492))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28531,15 +29288,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 27211, 27427),
+            span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6389, 6499),
         });
+        declarations.push(Declaration { id: DeclarationId(870), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(869) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1723)), 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(1722), 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(1721), 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(1721), 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(1721), 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(1721), 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(1721), 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(1722), 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(884),
-            name: Some("polynomial_square".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(845)],
-                output: DeclarationId(849),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 27483, 27533)),
+            id: DeclarationId(871),
+            name: Some("Mutability".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "Immutable".to_string(),
+                        ty: DeclarationId(1724),
+                    },
+                    Field {
+                        label: "Mutable".to_string(),
+                        ty: DeclarationId(1725),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28549,69 +29314,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 27429, 27533),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 340, 381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(885),
-            name: Some("product_pair".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849), DeclarationId(849)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(495))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 27535, 27633),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(886),
-            name: Some("fold_or_dominate_scan".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(850), DeclarationId(849)],
-                output: DeclarationId(850),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(502))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 27635, 27784),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(887),
-            name: Some("scan_hit".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(850)],
-                output: DeclarationId(128),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(504))),
-            },
-            type_params: vec![],
-            phantom_params: 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", 27786, 27841),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(888),
-            name: Some("filter_not_dominated_by".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1644), DeclarationId(849)],
-                output: DeclarationId(1645),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(517))),
+            id: DeclarationId(872),
+            name: Some("Purity".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "Pure".to_string(),
+                        ty: DeclarationId(1726),
+                    },
+                    Field {
+                        label: "Effectful".to_string(),
+                        ty: DeclarationId(1727),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28621,15 +29339,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 27843, 28205),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 598, 632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(889),
-            name: Some("drop_dominated_step".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1646), DeclarationId(849)],
-                output: DeclarationId(1647),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(524))),
+            id: DeclarationId(873),
+            name: Some("Structure".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "ExplicitDAG".to_string(),
+                        ty: DeclarationId(1728),
+                    },
+                    Field {
+                        label: "Arbitrary".to_string(),
+                        ty: DeclarationId(1729),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28639,15 +29364,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 28207, 28449),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 891, 935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(890),
-            name: Some("drop_dominated".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1648)],
-                output: DeclarationId(1649),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(527))),
+            id: DeclarationId(874),
+            name: Some("Iteration".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "Bounded".to_string(),
+                        ty: DeclarationId(1730),
+                    },
+                    Field {
+                        label: "Unbounded".to_string(),
+                        ty: DeclarationId(1731),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28657,26 +29389,30 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 28637, 28749),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 1147, 1187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(891),
-            name: Some("anthropic_messages".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![
-                    DeclarationId(147),
-                    DeclarationId(230),
-                    DeclarationId(1709),
-                    DeclarationId(93),
-                    DeclarationId(1710),
-                    DeclarationId(1711),
+            id: DeclarationId(875),
+            name: Some("ComputationModel".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "mutability".to_string(),
+                        ty: DeclarationId(871),
+                    },
+                    Field {
+                        label: "purity".to_string(),
+                        ty: DeclarationId(872),
+                    },
+                    Field {
+                        label: "structure".to_string(),
+                        ty: DeclarationId(873),
+                    },
+                    Field {
+                        label: "iteration".to_string(),
+                        ty: DeclarationId(874),
+                    },
                 ],
-                output: DeclarationId(912),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/anthropic_messages.dag",
-                    4627,
-                    4656,
-                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28686,40 +29422,76 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4419, 4656),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 1387, 1500),
         });
         declarations.push(Declaration {
-            id: DeclarationId(892),
-            name: Some("anthropic_operations".to_string()),
+            id: DeclarationId(876),
+            name: Some("dag_model".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1178),
-                }],
+                template: DeclarationId(875),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1712)),
+            meta_tag: Some(DeclarationId(875)),
             specialization_parent: None,
             inhabits: None,
-            value_body: Some(ValueBody::List(vec![])),
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "mutability".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1724),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "purity".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1726),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "structure".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1728),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "iteration".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1730),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6519, 6566),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 1502, 1625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(893),
-            name: Some("AnthropicChatMessage".to_string()),
+            id: DeclarationId(877),
+            name: Some("MemoryModel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "UserMessage".to_string(),
-                        ty: DeclarationId(1714),
+                        label: "ValueOnly".to_string(),
+                        ty: DeclarationId(1732),
                     },
                     Field {
-                        label: "AssistantMessage".to_string(),
-                        ty: DeclarationId(1716),
+                        label: "GarbageCollected".to_string(),
+                        ty: DeclarationId(1733),
+                    },
+                    Field {
+                        label: "RefCounted".to_string(),
+                        ty: DeclarationId(1734),
+                    },
+                    Field {
+                        label: "OwnershipBased".to_string(),
+                        ty: DeclarationId(1735),
                     },
                 ],
             },
@@ -28731,20 +29503,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/anthropic_schema.dag", 2660, 2822),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 2014, 2099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(894),
-            name: Some("ImageSource".to_string()),
+            id: DeclarationId(878),
+            name: Some("ScopeModel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "Base64Image".to_string(),
-                        ty: DeclarationId(1717),
+                        label: "LexicalScoping".to_string(),
+                        ty: DeclarationId(1736),
                     },
                     Field {
-                        label: "UrlImage".to_string(),
-                        ty: DeclarationId(1718),
+                        label: "DynamicScoping".to_string(),
+                        ty: DeclarationId(1737),
                     },
                 ],
             },
@@ -28756,20 +29528,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/anthropic_schema.dag", 3190, 3305),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 2365, 2418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(895),
-            name: Some("ContentBlock".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
+            id: DeclarationId(879),
+            name: Some("TargetExecutionModel".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
                     Field {
-                        label: "TextContent".to_string(),
-                        ty: DeclarationId(1719),
+                        label: "memory".to_string(),
+                        ty: DeclarationId(877),
                     },
                     Field {
-                        label: "ImageContent".to_string(),
-                        ty: DeclarationId(1720),
+                        label: "scope".to_string(),
+                        ty: DeclarationId(878),
                     },
                 ],
             },
@@ -28781,15 +29553,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/anthropic_schema.dag", 3546, 3637),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 2561, 2632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(896),
-            name: Some("CacheControl".to_string()),
+            id: DeclarationId(880),
+            name: Some("SourceFiltering".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
-                    label: "type".to_string(),
-                    ty: DeclarationId(230),
+                    label: "excluded_prefixes".to_string(),
+                    ty: DeclarationId(1738),
                 }],
             },
             type_params: vec![],
@@ -28800,16 +29572,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3804, 3840),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 2774, 2832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(897),
-            name: Some("AnthropicSearchResultCitationsConfig".to_string()),
+            id: DeclarationId(881),
+            name: Some("ShapeATargetSourceFiltering".to_string()),
             connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "enabled".to_string(),
-                    ty: DeclarationId(128),
-                }],
+                children: vec![
+                    Field {
+                        label: "internal".to_string(),
+                        ty: DeclarationId(880),
+                    },
+                    Field {
+                        label: "additional_excluded_prefixes".to_string(),
+                        ty: DeclarationId(1739),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28819,20 +29597,47 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3937, 3998),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 3115, 3224),
         });
         declarations.push(Declaration {
-            id: DeclarationId(898),
-            name: Some("AnthropicToolResultContent".to_string()),
+            id: DeclarationId(882),
+            name: Some("internal_source_filtering".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(880),
+                arguments: vec![],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(880)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![(
+                    "excluded_prefixes".to_string(),
+                    FieldValue::List(vec![
+                        FieldValue::Literal(LiteralBits::String("dsl/std/".to_string())),
+                        FieldValue::Literal(LiteralBits::String("dsl/extdeps/".to_string())),
+                        FieldValue::Literal(LiteralBits::String("src/v3/std/".to_string())),
+                        FieldValue::Literal(LiteralBits::String("src/v3/spec/".to_string())),
+                    ]),
+                )],
+            }),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 3226, 3381),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(883),
+            name: Some("ExecutionModelRequirement".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "ToolResultText".to_string(),
-                        ty: DeclarationId(1721),
+                        label: "OwnershipBased".to_string(),
+                        ty: DeclarationId(1740),
                     },
                     Field {
-                        label: "ToolResultBlocks".to_string(),
-                        ty: DeclarationId(1723),
+                        label: "GarbageCollected".to_string(),
+                        ty: DeclarationId(1741),
                     },
                 ],
             },
@@ -28844,16 +29649,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/anthropic_schema.dag", 4296, 4407),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 3659, 3729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(899),
-            name: Some("AnthropicToolResultWireTextTag".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![Field {
-                    label: "Text".to_string(),
-                    ty: DeclarationId(1724),
-                }],
+            id: DeclarationId(884),
+            name: Some("VariantId".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(230),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -28863,15 +29666,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/anthropic_schema.dag", 5576, 5623),
+            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 5139, 5162),
         });
         declarations.push(Declaration {
-            id: DeclarationId(900),
-            name: Some("AnthropicPlainTextDocumentMediaType".to_string()),
+            id: DeclarationId(885),
+            name: Some("WireTagValue".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
-                    label: "TextPlain".to_string(),
-                    ty: DeclarationId(1725),
+                    label: "StringTag".to_string(),
+                    ty: DeclarationId(1742),
                 }],
             },
             type_params: vec![],
@@ -28882,20 +29685,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/anthropic_schema.dag", 5704, 5761),
+            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 6737, 6786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(901),
-            name: Some("AnthropicToolResultTextBlock".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
+            id: DeclarationId(886),
+            name: Some("FieldProjection".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "type".to_string(),
-                        ty: DeclarationId(899),
+                        label: "Empty".to_string(),
+                        ty: DeclarationId(1743),
                     },
                     Field {
-                        label: "text".to_string(),
-                        ty: DeclarationId(230),
+                        label: "Populated".to_string(),
+                        ty: DeclarationId(1744),
                     },
                 ],
             },
@@ -28907,32 +29710,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/anthropic_schema.dag", 5852, 5943),
+            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7586, 7630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(902),
-            name: Some("AnthropicToolResultBlock".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "AnthropicTextBlock".to_string(),
-                        ty: DeclarationId(1726),
-                    },
-                    Field {
-                        label: "AnthropicImageBlock".to_string(),
-                        ty: DeclarationId(1727),
-                    },
-                    Field {
-                        label: "AnthropicDocumentBlock".to_string(),
-                        ty: DeclarationId(1728),
-                    },
+            id: DeclarationId(887),
+            name: Some("CoproductVariantProjection".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
                     Field {
-                        label: "AnthropicSearchResultBlock".to_string(),
-                        ty: DeclarationId(1732),
+                        label: "field_projection".to_string(),
+                        ty: DeclarationId(886),
                     },
                     Field {
-                        label: "AnthropicToolReferenceBlock".to_string(),
-                        ty: DeclarationId(1733),
+                        label: "wire_tag_value".to_string(),
+                        ty: DeclarationId(885),
                     },
                 ],
             },
@@ -28944,49 +29735,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/anthropic_schema.dag", 5945, 6418),
+            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 8046, 8150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(903),
-            name: Some("AnthropicToolResultPlainTextDocumentSource".to_string()),
+            id: DeclarationId(888),
+            name: Some("CoproductProjection".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "type".to_string(),
-                        ty: DeclarationId(899),
-                    },
-                    Field {
-                        label: "media_type".to_string(),
-                        ty: DeclarationId(900),
+                        label: "declaration".to_string(),
+                        ty: DeclarationId(1314),
                     },
                     Field {
-                        label: "document_data".to_string(),
+                        label: "wire_tag_field".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/anthropic_schema.dag", 6420, 6645),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(904),
-            name: Some("AnthropicUserContentBlock".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "UserTextBlock".to_string(),
-                        ty: DeclarationId(1734),
-                    },
                     Field {
-                        label: "UserToolResultBlock".to_string(),
-                        ty: DeclarationId(1737),
+                        label: "variant_projections".to_string(),
+                        ty: DeclarationId(1745),
                     },
                 ],
             },
@@ -28998,22 +29764,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/anthropic_schema.dag", 6891, 7085),
+            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 9395, 9557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(905),
-            name: Some("AnthropicAssistantContentBlock".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "AssistantTextBlock".to_string(),
-                        ty: DeclarationId(1738),
-                    },
-                    Field {
-                        label: "AssistantToolUseBlock".to_string(),
-                        ty: DeclarationId(1739),
-                    },
-                ],
+            id: DeclarationId(889),
+            name: Some("BootstrapFixture".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "virtual_path".to_string(),
+                    ty: DeclarationId(230),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -29023,77 +29783,52 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7492, 7658),
+            span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1395, 1443),
         });
         declarations.push(Declaration {
-            id: DeclarationId(906),
-            name: Some("AnthropicStopReason".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "EndTurn".to_string(),
-                        ty: DeclarationId(1740),
-                    },
-                    Field {
-                        label: "MaxTokens".to_string(),
-                        ty: DeclarationId(1741),
-                    },
+            id: DeclarationId(890),
+            name: Some("BootstrapFixtureSet".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
                     Field {
-                        label: "StopSequence".to_string(),
-                        ty: DeclarationId(1742),
+                        label: "rust_pilot_primitives".to_string(),
+                        ty: DeclarationId(889),
                     },
                     Field {
-                        label: "ToolUse".to_string(),
-                        ty: DeclarationId(1743),
+                        label: "rust_method_template_contracts".to_string(),
+                        ty: DeclarationId(889),
                     },
                     Field {
-                        label: "PauseTurn".to_string(),
-                        ty: DeclarationId(1744),
+                        label: "python_method_template_contracts".to_string(),
+                        ty: DeclarationId(889),
                     },
                     Field {
-                        label: "Refusal".to_string(),
-                        ty: DeclarationId(1745),
+                        label: "go_method_template_contracts".to_string(),
+                        ty: DeclarationId(889),
                     },
                     Field {
-                        label: "ModelContextWindowExceeded".to_string(),
-                        ty: DeclarationId(1746),
+                        label: "anthropic_operations".to_string(),
+                        ty: DeclarationId(889),
                     },
-                ],
-            },
-            type_params: vec![],
-            phantom_params: 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", 7987, 8123),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(907),
-            name: Some("AnthropicMessages200Citation".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
                     Field {
-                        label: "CharLocation".to_string(),
-                        ty: DeclarationId(1749),
+                        label: "cross_target_coverage".to_string(),
+                        ty: DeclarationId(889),
                     },
                     Field {
-                        label: "PageLocation".to_string(),
-                        ty: DeclarationId(1752),
+                        label: "extdeps_cron".to_string(),
+                        ty: DeclarationId(889),
                     },
                     Field {
-                        label: "ContentBlockLocation".to_string(),
-                        ty: DeclarationId(1755),
+                        label: "extdeps_github_github".to_string(),
+                        ty: DeclarationId(889),
                     },
                     Field {
-                        label: "WebSearchResultLocation".to_string(),
-                        ty: DeclarationId(1757),
+                        label: "extdeps_github_actions".to_string(),
+                        ty: DeclarationId(889),
                     },
                     Field {
-                        label: "SearchResultLocation".to_string(),
-                        ty: DeclarationId(1759),
+                        label: "extdeps_github_ci".to_string(),
+                        ty: DeclarationId(889),
                     },
                 ],
             },
@@ -29105,88 +29840,199 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8325, 9071),
+            span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1600, 2062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(908),
-            name: Some("AnthropicMessages200ContentBlock".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "MessagesTextBlock".to_string(),
-                        ty: DeclarationId(1762),
-                    },
-                    Field {
-                        label: "MessagesThinkingBlock".to_string(),
-                        ty: DeclarationId(1763),
-                    },
-                    Field {
-                        label: "MessagesRedactedThinkingBlock".to_string(),
-                        ty: DeclarationId(1764),
-                    },
-                    Field {
-                        label: "MessagesToolUseBlock".to_string(),
-                        ty: DeclarationId(1766),
-                    },
-                    Field {
-                        label: "MessagesServerToolUseBlock".to_string(),
-                        ty: DeclarationId(1768),
-                    },
-                    Field {
-                        label: "MessagesWebSearchToolResultBlock".to_string(),
-                        ty: DeclarationId(1770),
-                    },
-                ],
+            id: DeclarationId(891),
+            name: Some("bootstrap_fixture_authority".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(890),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(890)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9608, 10136),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(909),
-            name: Some("AnthropicServerToolName".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "WebSearch".to_string(),
-                        ty: DeclarationId(1771),
-                    },
-                    Field {
-                        label: "WebFetch".to_string(),
-                        ty: DeclarationId(1772),
-                    },
-                    Field {
-                        label: "CodeExecution".to_string(),
-                        ty: DeclarationId(1773),
-                    },
-                    Field {
-                        label: "BashCodeExecution".to_string(),
-                        ty: DeclarationId(1774),
-                    },
-                    Field {
-                        label: "TextEditorCodeExecution".to_string(),
-                        ty: DeclarationId(1775),
-                    },
-                    Field {
-                        label: "ToolSearchToolRegex".to_string(),
-                        ty: DeclarationId(1776),
-                    },
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "rust_pilot_primitives".to_string(),
+                        FieldValue::Record(vec![(
+                            "virtual_path".to_string(),
+                            FieldValue::Literal(LiteralBits::String(
+                                "dsl/extdeps/languages/rust/primitives.dag".to_string(),
+                            )),
+                        )]),
+                    ),
+                    (
+                        "rust_method_template_contracts".to_string(),
+                        FieldValue::Record(vec![(
+                            "virtual_path".to_string(),
+                            FieldValue::Literal(LiteralBits::String(
+                                "src/v3/std/rust_method_template_contracts.dag".to_string(),
+                            )),
+                        )]),
+                    ),
+                    (
+                        "python_method_template_contracts".to_string(),
+                        FieldValue::Record(vec![(
+                            "virtual_path".to_string(),
+                            FieldValue::Literal(LiteralBits::String(
+                                "src/v3/std/python_method_template_contracts.dag".to_string(),
+                            )),
+                        )]),
+                    ),
+                    (
+                        "go_method_template_contracts".to_string(),
+                        FieldValue::Record(vec![(
+                            "virtual_path".to_string(),
+                            FieldValue::Literal(LiteralBits::String(
+                                "src/v3/std/go_method_template_contracts.dag".to_string(),
+                            )),
+                        )]),
+                    ),
+                    (
+                        "anthropic_operations".to_string(),
+                        FieldValue::Record(vec![(
+                            "virtual_path".to_string(),
+                            FieldValue::Literal(LiteralBits::String(
+                                "src/v3/std/anthropic_operations.dag".to_string(),
+                            )),
+                        )]),
+                    ),
+                    (
+                        "cross_target_coverage".to_string(),
+                        FieldValue::Record(vec![(
+                            "virtual_path".to_string(),
+                            FieldValue::Literal(LiteralBits::String(
+                                "src/v3/std/cross_target_coverage.dag".to_string(),
+                            )),
+                        )]),
+                    ),
+                    (
+                        "extdeps_cron".to_string(),
+                        FieldValue::Record(vec![(
+                            "virtual_path".to_string(),
+                            FieldValue::Literal(LiteralBits::String(
+                                "dsl/extdeps/cron_schedule_model.dag".to_string(),
+                            )),
+                        )]),
+                    ),
+                    (
+                        "extdeps_github_github".to_string(),
+                        FieldValue::Record(vec![(
+                            "virtual_path".to_string(),
+                            FieldValue::Literal(LiteralBits::String(
+                                "dsl/extdeps/github/github.dag".to_string(),
+                            )),
+                        )]),
+                    ),
+                    (
+                        "extdeps_github_actions".to_string(),
+                        FieldValue::Record(vec![(
+                            "virtual_path".to_string(),
+                            FieldValue::Literal(LiteralBits::String(
+                                "dsl/extdeps/github/actions.dag".to_string(),
+                            )),
+                        )]),
+                    ),
+                    (
+                        "extdeps_github_ci".to_string(),
+                        FieldValue::Record(vec![(
+                            "virtual_path".to_string(),
+                            FieldValue::Literal(LiteralBits::String(
+                                "dsl/extdeps/github/ci.dag".to_string(),
+                            )),
+                        )]),
+                    ),
+                ],
+            }),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 2064, 3032),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(892),
+            name: Some("signed_int_diagnostic_order".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1314),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(1746)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::List(vec![
+                FieldValue::Reference(DeclarationId(77)),
+                FieldValue::Reference(DeclarationId(78)),
+                FieldValue::Reference(DeclarationId(79)),
+                FieldValue::Reference(DeclarationId(80)),
+                FieldValue::Reference(DeclarationId(81)),
+            ])),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1200, 1304),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(893),
+            name: Some("unsigned_int_diagnostic_order".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1314),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(1747)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::List(vec![
+                FieldValue::Reference(DeclarationId(82)),
+                FieldValue::Reference(DeclarationId(83)),
+                FieldValue::Reference(DeclarationId(84)),
+                FieldValue::Reference(DeclarationId(85)),
+                FieldValue::Reference(DeclarationId(86)),
+            ])),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1378, 1489),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(894),
+            name: Some("Lookup".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "ToolSearchToolBm25".to_string(),
-                        ty: DeclarationId(1777),
+                        label: "Miss".to_string(),
+                        ty: DeclarationId(1750),
                     },
                     Field {
-                        label: "Advisor".to_string(),
-                        ty: DeclarationId(1778),
+                        label: "Hit".to_string(),
+                        ty: DeclarationId(1751),
                     },
                 ],
             },
+            type_params: vec![DeclarationId(895)],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/lookup.dag", 4521, 4563),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(895),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("value".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -29195,32 +30041,60 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10324, 10506),
+            span: SourceSpan::new("src/v3/std/lookup.dag", 4521, 4563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(910),
-            name: Some("AnthropicMessages200Usage".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "input_tokens".to_string(),
-                        ty: DeclarationId(93),
-                    },
-                    Field {
-                        label: "output_tokens".to_string(),
-                        ty: DeclarationId(93),
-                    },
+            id: DeclarationId(896),
+            name: Some("miss_int_lookup".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![],
+                output: DeclarationId(1748),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4601, 4611)),
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/lookup.dag", 4565, 4611),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(897),
+            name: Some("hit_int_lookup".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(93)],
+                output: DeclarationId(1749),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4654, 4666)),
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/lookup.dag", 4613, 4666),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(898),
+            name: Some("CollectionSizeEffect".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "cache_creation_input_tokens".to_string(),
-                        ty: DeclarationId(1779),
+                        label: "ShrinkEffect".to_string(),
+                        ty: DeclarationId(1776),
                     },
                     Field {
-                        label: "cache_read_input_tokens".to_string(),
-                        ty: DeclarationId(1780),
+                        label: "ProjectionEffect".to_string(),
+                        ty: DeclarationId(1777),
                     },
                     Field {
-                        label: "service_tier".to_string(),
-                        ty: DeclarationId(1781),
+                        label: "IdentityEffect".to_string(),
+                        ty: DeclarationId(1778),
                     },
                 ],
             },
@@ -29232,16 +30106,30 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10622, 10837),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 4923, 5005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(911),
-            name: Some("AnthropicMessages200Role".to_string()),
+            id: DeclarationId(899),
+            name: Some("CostShape".to_string()),
             connective: TypeConnective::Disj {
-                variants: vec![Field {
-                    label: "Assistant".to_string(),
-                    ty: DeclarationId(1782),
-                }],
+                variants: vec![
+                    Field {
+                        label: "ShapeConstant".to_string(),
+                        ty: DeclarationId(1779),
+                    },
+                    Field {
+                        label: "ShapeLinearScan".to_string(),
+                        ty: DeclarationId(1780),
+                    },
+                    Field {
+                        label: "ShapeIterateBody".to_string(),
+                        ty: DeclarationId(1781),
+                    },
+                    Field {
+                        label: "ShapeSortBody".to_string(),
+                        ty: DeclarationId(1782),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -29251,47 +30139,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11158, 11201),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 5836, 5927),
         });
         declarations.push(Declaration {
-            id: DeclarationId(912),
-            name: Some("AnthropicMessages200Body".to_string()),
+            id: DeclarationId(900),
+            name: Some("MethodContract".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "id".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "type".to_string(),
-                        ty: DeclarationId(230),
+                        label: "algebra_id".to_string(),
+                        ty: DeclarationId(723),
                     },
                     Field {
-                        label: "role".to_string(),
-                        ty: DeclarationId(911),
+                        label: "method_id".to_string(),
+                        ty: DeclarationId(723),
                     },
                     Field {
-                        label: "content".to_string(),
+                        label: "size_effect".to_string(),
                         ty: DeclarationId(1783),
                     },
                     Field {
-                        label: "model".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "stop_reason".to_string(),
-                        ty: DeclarationId(906),
-                    },
-                    Field {
-                        label: "stop_sequence".to_string(),
+                        label: "cost_shape".to_string(),
                         ty: DeclarationId(1784),
                     },
                     Field {
-                        label: "usage".to_string(),
-                        ty: DeclarationId(910),
-                    },
-                    Field {
-                        label: "container".to_string(),
+                        label: "callback_element_position".to_string(),
                         ty: DeclarationId(1785),
                     },
                 ],
@@ -29304,24 +30176,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/anthropic_schema.dag", 11548, 11879),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 6688, 6862),
         });
         declarations.push(Declaration {
-            id: DeclarationId(913),
-            name: Some("BinShim".to_string()),
+            id: DeclarationId(901),
+            name: Some("SizeVariable".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "entrypoint_name".to_string(),
-                        ty: DeclarationId(151),
-                    },
-                    Field {
-                        label: "description".to_string(),
-                        ty: DeclarationId(230),
+                        label: "source_port".to_string(),
+                        ty: DeclarationId(722),
                     },
                     Field {
-                        label: "entry".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "display_name".to_string(),
+                        ty: DeclarationId(1786),
                     },
                 ],
             },
@@ -29333,58 +30201,126 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/bin_shim.dag", 801, 894),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 7371, 7438),
         });
         declarations.push(Declaration {
-            id: DeclarationId(914),
-            name: Some("BootstrapAuthority".to_string()),
+            id: DeclarationId(902),
+            name: Some("unnamed_size_variable".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(722)],
+                output: DeclarationId(901),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 7502, 7534)),
+            },
+            type_params: vec![],
+            phantom_params: 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", 7440, 7534),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(903),
+            name: Some("size_variable_eq".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(901), DeclarationId(901)],
+                output: DeclarationId(128),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(178))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 7536, 7632),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(904),
+            name: Some("DegreeAtLeastTwo".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "StdAuthority".to_string(),
-                        ty: DeclarationId(1786),
-                    },
-                    Field {
-                        label: "V3StdAuthority".to_string(),
+                        label: "DegreeTwo".to_string(),
                         ty: DeclarationId(1787),
                     },
                     Field {
-                        label: "V3SpecAuthority".to_string(),
+                        label: "DegreeSuccessor".to_string(),
                         ty: DeclarationId(1788),
                     },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: 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", 8379, 8465),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(905),
+            name: Some("SymbolicCost".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "CompilerAuthority".to_string(),
+                        label: "ConstantCost".to_string(),
                         ty: DeclarationId(1789),
                     },
                     Field {
-                        label: "ExtdepsFixtureAuthority".to_string(),
+                        label: "LinearCost".to_string(),
                         ty: DeclarationId(1790),
                     },
+                    Field {
+                        label: "PolynomialCost".to_string(),
+                        ty: DeclarationId(1791),
+                    },
+                    Field {
+                        label: "ProductCost".to_string(),
+                        ty: DeclarationId(1793),
+                    },
+                    Field {
+                        label: "SumCost".to_string(),
+                        ty: DeclarationId(1795),
+                    },
+                    Field {
+                        label: "LogCost".to_string(),
+                        ty: DeclarationId(1796),
+                    },
+                    Field {
+                        label: "UnknownCost".to_string(),
+                        ty: DeclarationId(1797),
+                    },
                 ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: None,
+            inhabits: Some(DeclarationId(1798)),
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 985, 1114),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 9452, 9761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(915),
-            name: Some("BootstrapAuthoritySet".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(137),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(138),
-                        value: DeclarationId(230),
+            id: DeclarationId(906),
+            name: Some("DominateScanAcc".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "any".to_string(),
+                        ty: DeclarationId(128),
                     },
-                    TemplateArgument {
-                        parameter: DeclarationId(139),
-                        value: DeclarationId(914),
+                    Field {
+                        label: "pivot".to_string(),
+                        ty: DeclarationId(905),
                     },
                 ],
             },
@@ -29396,526 +30332,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1299, 1359),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 10167, 10225),
         });
         declarations.push(Declaration {
-            id: DeclarationId(916),
-            name: Some("bootstrap_authority".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
-                arguments: vec![],
+            id: DeclarationId(907),
+            name: Some("dominate_scan_init".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(905)],
+                output: DeclarationId(906),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(181))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: None,
             specialization_parent: None,
             inhabits: None,
-            value_body: Some(ValueBody::Map(
-                FieldMap::from_entries(vec![
-                    (
-                        "dsl/std/logic.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1786),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/bit.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1786),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/error_primitives.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1786),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/algebra.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1786),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/magnitude.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1786),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/machine_constraints.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1786),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/nat.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1786),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/integer.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1786),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/rational.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1786),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/float.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1786),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/types.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1786),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/string_type.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1786),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/unicode.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1786),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/render_repeat_string_bootstrap.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1786),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/methods.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1786),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/std/serialization.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1786),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/algebra.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/anthropic_messages.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/anthropic_operations.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/anthropic_schema.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/approximate_field.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/bin_shim.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/bootstrap_authority.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/bridge_ledger.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/clean_emission.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/computation.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/computation_model.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/coproduct_projection.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/cross_target_coverage.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/diagnostics.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/dimensions.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/effects.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/emission_provenance.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/emit_model.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/extdeps_bootstrap_fixtures.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/go_method_template_contracts.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/induction.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/integer_diagnostic_order.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/lens.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/lens_application.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/list.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/lookup.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/methods.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/parse_surface.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/python_method_template_contracts.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/resources.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/runtime.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/rust_method_template_contracts.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/services.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/substrate.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/substrate_minimal.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/termination.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/t_ci_workflow_as_data_demo.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/timing_lens.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/tokenize.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/verification.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/std/workflows.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1787),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/spec/v3_l1.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1788),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/spec/go.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1788),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/spec/python.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1788),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/spec/rust.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1788),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/compiler/pipeline.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1789),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/compiler/operators.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1789),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "src/v3/compiler/regen.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1789),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/extdeps/languages/rust/primitives.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1790),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/extdeps/cron_schedule_model.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1790),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/extdeps/github/github.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1790),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/extdeps/github/actions.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1790),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "dsl/extdeps/github/ci.dag".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1790),
-                            payload: vec![],
-                        },
-                    ),
-                ])
-                .expect("ValueBody::Map"),
-            )),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1361, 4934),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 10227, 10322),
         });
         declarations.push(Declaration {
-            id: DeclarationId(917),
-            name: Some("BridgeStatus".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Retired".to_string(),
-                        ty: DeclarationId(1791),
-                    },
-                    Field {
-                        label: "Open".to_string(),
-                        ty: DeclarationId(1792),
-                    },
-                ],
+            id: DeclarationId(908),
+            name: Some("miss_symbolic_cost_lookup".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![],
+                output: DeclarationId(1752),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 10963, 10973)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -29925,16 +30368,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/bridge_ledger.dag", 4697, 4735),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 10908, 10973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(918),
-            name: Some("BridgeLedgerRef".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "decl".to_string(),
-                    ty: DeclarationId(1300),
-                }],
+            id: DeclarationId(909),
+            name: Some("hit_symbolic_cost_lookup".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(905)],
+                output: DeclarationId(1753),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 11047, 11062)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -29944,30 +30386,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/bridge_ledger.dag", 5699, 5746),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 10975, 11062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(919),
-            name: Some("BridgeLedgerRow".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "owner".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "status".to_string(),
-                        ty: DeclarationId(917),
-                    },
-                    Field {
-                        label: "authority".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                ],
+            id: DeclarationId(910),
+            name: Some("two_terms".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(905), DeclarationId(905)],
+                output: DeclarationId(1754),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(185))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -29977,51 +30404,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/bridge_ledger.dag", 6389, 6499),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 11064, 11539),
         });
-        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()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "expression_wrapping".to_string(),
-                        ty: DeclarationId(923),
-                    },
-                    Field {
-                        label: "pattern_bindings".to_string(),
-                        ty: DeclarationId(924),
-                    },
-                    Field {
-                        label: "variant_payload_field_access".to_string(),
-                        ty: DeclarationId(925),
-                    },
-                    Field {
-                        label: "imports".to_string(),
-                        ty: DeclarationId(926),
-                    },
-                    Field {
-                        label: "block_return".to_string(),
-                        ty: DeclarationId(927),
-                    },
-                    Field {
-                        label: "variable_bindings".to_string(),
-                        ty: DeclarationId(928),
-                    },
-                    Field {
-                        label: "match_arm_body".to_string(),
-                        ty: DeclarationId(929),
-                    },
-                    Field {
-                        label: "correction_style".to_string(),
-                        ty: DeclarationId(930),
-                    },
-                    Field {
-                        label: "post_emit_verifier".to_string(),
-                        ty: DeclarationId(931),
-                    },
-                ],
+            id: DeclarationId(911),
+            name: Some("many_terms".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(905), DeclarationId(905), DeclarationId(1755)],
+                output: DeclarationId(1756),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(187))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30031,22 +30422,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/clean_emission.dag", 562, 944),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 11541, 11726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(922),
-            name: Some("TargetCleanEmissionBinding".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "language".to_string(),
-                        ty: DeclarationId(1051),
-                    },
-                    Field {
-                        label: "clean_emission".to_string(),
-                        ty: DeclarationId(921),
-                    },
-                ],
+            id: DeclarationId(912),
+            name: Some("reject_all_symbolic_costs".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(905)],
+                output: DeclarationId(128),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(192))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30056,26 +30440,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/clean_emission.dag", 1748, 1848),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 11728, 11856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(923),
-            name: Some("ExpressionWrappingRule".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "WrapEverything".to_string(),
-                        ty: DeclarationId(1794),
-                    },
-                    Field {
-                        label: "WrapOnlyInOperandPosition".to_string(),
-                        ty: DeclarationId(1795),
-                    },
-                    Field {
-                        label: "NoWrapping".to_string(),
-                        ty: DeclarationId(1796),
-                    },
-                ],
+            id: DeclarationId(913),
+            name: Some("degree_raw".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(904)],
+                output: DeclarationId(93),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(200))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30085,30 +30458,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/clean_emission.dag", 2192, 2283),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 11858, 12011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(924),
-            name: Some("PatternBindingRule".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "EmitBindingAlways".to_string(),
-                        ty: DeclarationId(1797),
-                    },
-                    Field {
-                        label: "EmitUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(1798),
-                    },
-                    Field {
-                        label: "EmitPrefixedUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(1799),
-                    },
-                    Field {
-                        label: "NotApplicablePatternBinding".to_string(),
-                        ty: DeclarationId(1800),
-                    },
-                ],
+            id: DeclarationId(914),
+            name: Some("sequential".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(905), DeclarationId(905)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(204))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30118,22 +30476,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/clean_emission.dag", 2520, 2663),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 12247, 12350),
         });
         declarations.push(Declaration {
-            id: DeclarationId(925),
-            name: Some("VariantPayloadFieldAccessRule".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "AccessFromPayloadBinding".to_string(),
-                        ty: DeclarationId(1801),
-                    },
-                    Field {
-                        label: "OverrideNamedFieldsAtBindingSite".to_string(),
-                        ty: DeclarationId(1802),
-                    },
-                ],
+            id: DeclarationId(915),
+            name: Some("iterate".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(905), DeclarationId(905)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(208))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30143,26 +30494,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/clean_emission.dag", 3330, 3430),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 12536, 12654),
         });
         declarations.push(Declaration {
-            id: DeclarationId(926),
-            name: Some("ImportRule".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "ImportEverythingDeclared".to_string(),
-                        ty: DeclarationId(1803),
-                    },
-                    Field {
-                        label: "IncludeOnlyReferenced".to_string(),
-                        ty: DeclarationId(1804),
-                    },
-                    Field {
-                        label: "ImportPerUsageSite".to_string(),
-                        ty: DeclarationId(1805),
-                    },
-                ],
+            id: DeclarationId(916),
+            name: Some("max_path_step".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(905), DeclarationId(905)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(212))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30172,26 +30512,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/clean_emission.dag", 3544, 3637),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 13514, 13681),
         });
         declarations.push(Declaration {
-            id: DeclarationId(927),
-            name: Some("BlockReturnRule".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "WrapReturnValue".to_string(),
-                        ty: DeclarationId(1806),
-                    },
-                    Field {
-                        label: "NoWrappingOnTerminalExpression".to_string(),
-                        ty: DeclarationId(1807),
-                    },
-                    Field {
-                        label: "ExplicitReturnKeyword".to_string(),
-                        ty: DeclarationId(1808),
-                    },
-                ],
+            id: DeclarationId(917),
+            name: Some("keep_or_sum".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(905), DeclarationId(905)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(216))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30201,26 +30530,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/clean_emission.dag", 3756, 3857),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 13683, 13841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(928),
-            name: Some("VariableBindingRule".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "EmitLetBindingAlways".to_string(),
-                        ty: DeclarationId(1809),
-                    },
-                    Field {
-                        label: "EmitLetUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(1810),
-                    },
-                    Field {
-                        label: "OmitLetBinding".to_string(),
-                        ty: DeclarationId(1811),
-                    },
-                ],
+            id: DeclarationId(918),
+            name: Some("max_path".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1757)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(220))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30230,26 +30548,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/clean_emission.dag", 3995, 4095),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 14143, 14245),
         });
         declarations.push(Declaration {
-            id: DeclarationId(929),
-            name: Some("MatchArmBodyRule".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "WrapBody".to_string(),
-                        ty: DeclarationId(1812),
-                    },
-                    Field {
-                        label: "NoWrappingOnNonComplexBody".to_string(),
-                        ty: DeclarationId(1813),
-                    },
-                    Field {
-                        label: "NotApplicableMatchArmBody".to_string(),
-                        ty: DeclarationId(1814),
-                    },
-                ],
+            id: DeclarationId(919),
+            name: Some("dominates".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(905), DeclarationId(905)],
+                output: DeclarationId(128),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(273))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30259,30 +30566,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/clean_emission.dag", 4328, 4423),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 15113, 17198),
         });
         declarations.push(Declaration {
-            id: DeclarationId(930),
-            name: Some("CorrectionStyle".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "indent_unit".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "line_ending".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "string_quote".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "trailing_semicolon".to_string(),
-                        ty: DeclarationId(128),
-                    },
-                ],
+            id: DeclarationId(920),
+            name: Some("same_size_variable".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(901), DeclarationId(901)],
+                output: DeclarationId(128),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(275))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30292,65 +30584,44 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 4736, 4854),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 17200, 17290),
         });
         declarations.push(Declaration {
-            id: DeclarationId(931),
-            name: Some("PostEmitVerifier".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "command".to_string(),
-                        ty: DeclarationId(230),
-                    },
+            id: DeclarationId(921),
+            name: Some("AsymptoticClass".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "args".to_string(),
-                        ty: DeclarationId(1815),
+                        label: "ClassConstant".to_string(),
+                        ty: DeclarationId(1799),
                     },
                     Field {
-                        label: "syntax_only".to_string(),
-                        ty: DeclarationId(128),
+                        label: "ClassLog".to_string(),
+                        ty: DeclarationId(1800),
                     },
                     Field {
-                        label: "expected_exit_code".to_string(),
-                        ty: DeclarationId(93),
+                        label: "ClassLinear".to_string(),
+                        ty: DeclarationId(1801),
                     },
                     Field {
-                        label: "output_policy".to_string(),
-                        ty: DeclarationId(932),
+                        label: "ClassLinearithmic".to_string(),
+                        ty: DeclarationId(1802),
                     },
-                ],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 5270, 5418),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(932),
-            name: Some("VerifierOutputPolicy".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
                     Field {
-                        label: "IgnoreVerifierOutput".to_string(),
-                        ty: DeclarationId(1816),
+                        label: "ClassQuadratic".to_string(),
+                        ty: DeclarationId(1803),
                     },
                     Field {
-                        label: "RequireEmptyStdout".to_string(),
-                        ty: DeclarationId(1817),
+                        label: "ClassPolynomial".to_string(),
+                        ty: DeclarationId(1804),
                     },
                     Field {
-                        label: "RequireEmptyStderr".to_string(),
-                        ty: DeclarationId(1818),
+                        label: "ClassExponential".to_string(),
+                        ty: DeclarationId(1805),
                     },
                     Field {
-                        label: "RequireEmptyStdoutAndStderr".to_string(),
-                        ty: DeclarationId(1819),
+                        label: "ClassUnknown".to_string(),
+                        ty: DeclarationId(1806),
                     },
                 ],
             },
@@ -30358,50 +30629,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: None,
+            inhabits: Some(DeclarationId(1807)),
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/clean_emission.dag", 5663, 5791),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 18077, 18318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(933),
-            name: Some("SizeBound".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "CollectionSize".to_string(),
-                        ty: DeclarationId(1826),
-                    },
-                    Field {
-                        label: "ParserStreamSize".to_string(),
-                        ty: DeclarationId(1827),
-                    },
-                    Field {
-                        label: "WorklistDrainSize".to_string(),
-                        ty: DeclarationId(1828),
-                    },
-                    Field {
-                        label: "TreeSize".to_string(),
-                        ty: DeclarationId(1829),
-                    },
-                    Field {
-                        label: "ArithmeticParam".to_string(),
-                        ty: DeclarationId(1830),
-                    },
-                    Field {
-                        label: "ExplicitCountZero".to_string(),
-                        ty: DeclarationId(1831),
-                    },
-                    Field {
-                        label: "ExplicitCountPositive".to_string(),
-                        ty: DeclarationId(1832),
-                    },
-                    Field {
-                        label: "Forever".to_string(),
-                        ty: DeclarationId(1833),
-                    },
-                ],
+            id: DeclarationId(922),
+            name: Some("asymptotic_dominates".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(921), DeclarationId(921)],
+                output: DeclarationId(128),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(345))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30411,19 +30651,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/computation.dag", 1411, 1707),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 18320, 20588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(934),
-            name: Some("tree_size_bound".to_string()),
+            id: DeclarationId(923),
+            name: Some("meet_asymptotic_class".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(230)],
-                output: DeclarationId(933),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/computation.dag",
-                    1756,
-                    1787,
-                )),
+                inputs: vec![DeclarationId(921), DeclarationId(921)],
+                output: DeclarationId(921),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(348))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30433,46 +30669,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/computation.dag", 1709, 1787),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 20590, 20721),
         });
         declarations.push(Declaration {
-            id: DeclarationId(935),
-            name: Some("CallPattern".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "ChildAccessorCall".to_string(),
-                        ty: DeclarationId(1834),
-                    },
-                    Field {
-                        label: "CollectionShrinkCall".to_string(),
-                        ty: DeclarationId(1835),
-                    },
-                    Field {
-                        label: "ArithmeticSubtractCall".to_string(),
-                        ty: DeclarationId(1836),
-                    },
-                    Field {
-                        label: "ArithmeticDivideCall".to_string(),
-                        ty: DeclarationId(1837),
-                    },
-                    Field {
-                        label: "ParserAdvanceCall".to_string(),
-                        ty: DeclarationId(1838),
-                    },
-                    Field {
-                        label: "WorklistDrainCall".to_string(),
-                        ty: DeclarationId(1839),
-                    },
-                    Field {
-                        label: "FoldBodyCall".to_string(),
-                        ty: DeclarationId(1840),
-                    },
-                    Field {
-                        label: "SameArgumentCall".to_string(),
-                        ty: DeclarationId(1841),
-                    },
-                ],
+            id: DeclarationId(924),
+            name: Some("join_asymptotic_class".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(921), DeclarationId(921)],
+                output: DeclarationId(921),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(351))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30482,19 +30687,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/computation.dag", 2038, 2485),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 20723, 20854),
         });
         declarations.push(Declaration {
-            id: DeclarationId(936),
-            name: Some("per_call_pattern_at".to_string()),
+            id: DeclarationId(925),
+            name: Some("classify_symbolic_cost".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(1820),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/computation.dag",
-                    2764,
-                    2794,
-                )),
+                inputs: vec![DeclarationId(905)],
+                output: DeclarationId(921),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 20921, 20954)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30504,19 +30705,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/computation.dag", 2698, 2794),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 20856, 20954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(937),
-            name: Some("per_call_descent_operand_port".to_string()),
+            id: DeclarationId(926),
+            name: Some("normalize".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(1821),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/computation.dag",
-                    2969,
-                    3009,
-                )),
+                inputs: vec![DeclarationId(905)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(360))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30526,26 +30723,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/computation.dag", 2898, 3009),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 21828, 22193),
         });
         declarations.push(Declaration {
-            id: DeclarationId(938),
-            name: Some("ShrinkFactor".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "UnitShrink".to_string(),
-                        ty: DeclarationId(1842),
-                    },
-                    Field {
-                        label: "ConstantShrink".to_string(),
-                        ty: DeclarationId(1843),
-                    },
-                    Field {
-                        label: "ProportionalShrink".to_string(),
-                        ty: DeclarationId(1844),
-                    },
-                ],
+            id: DeclarationId(927),
+            name: Some("nsl_to_list".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1758)],
+                output: DeclarationId(1759),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(366))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30555,26 +30741,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/computation.dag", 3199, 3339),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 22195, 22324),
         });
         declarations.push(Declaration {
-            id: DeclarationId(939),
-            name: Some("IterationPrimitive".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Fold".to_string(),
-                        ty: DeclarationId(1845),
-                    },
-                    Field {
-                        label: "Descend".to_string(),
-                        ty: DeclarationId(1846),
-                    },
-                    Field {
-                        label: "Repeat".to_string(),
-                        ty: DeclarationId(1847),
-                    },
-                ],
+            id: DeclarationId(928),
+            name: Some("drop_additive_zero".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1760)],
+                output: DeclarationId(1761),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(379))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30584,30 +30759,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/computation.dag", 3501, 3556),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 22501, 22793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(940),
-            name: Some("LoweringTarget".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "primitive".to_string(),
-                        ty: DeclarationId(939),
-                    },
-                    Field {
-                        label: "bound".to_string(),
-                        ty: DeclarationId(933),
-                    },
-                    Field {
-                        label: "evidence".to_string(),
-                        ty: DeclarationId(1197),
-                    },
-                    Field {
-                        label: "factor".to_string(),
-                        ty: DeclarationId(1848),
-                    },
-                ],
+            id: DeclarationId(929),
+            name: Some("collapse_on_multiplicative_zero".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1762)],
+                output: DeclarationId(1763),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(386))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30617,19 +30777,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/computation.dag", 3748, 3874),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 23002, 23165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(941),
-            name: Some("lower_call_pattern".to_string()),
+            id: DeclarationId(930),
+            name: Some("any_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(935)],
-                output: DeclarationId(940),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/computation.dag",
-                    4185,
-                    5736,
-                )),
+                inputs: vec![DeclarationId(1764)],
+                output: DeclarationId(128),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(395))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30639,19 +30795,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/computation.dag", 4123, 5736),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 23167, 23332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(942),
-            name: Some("size_bound_param".to_string()),
+            id: DeclarationId(931),
+            name: Some("drop_multiplicative_one".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(933)],
-                output: DeclarationId(1822),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/computation.dag",
-                    5787,
-                    6212,
-                )),
+                inputs: vec![DeclarationId(1765)],
+                output: DeclarationId(1766),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(408))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30661,19 +30813,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/computation.dag", 5738, 6212),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 23490, 23796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(943),
-            name: Some("is_constant_bound".to_string()),
+            id: DeclarationId(932),
+            name: Some("is_zero_constant".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(933)],
+                inputs: vec![DeclarationId(905)],
                 output: DeclarationId(128),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/computation.dag",
-                    6261,
-                    6432,
-                )),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(418))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30683,19 +30831,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/computation.dag", 6214, 6432),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 23798, 24052),
         });
         declarations.push(Declaration {
-            id: DeclarationId(944),
-            name: Some("forever_iteration_bound".to_string()),
+            id: DeclarationId(933),
+            name: Some("is_one_constant".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(93),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/computation.dag",
-                    6549,
-                    6572,
-                )),
+                inputs: vec![DeclarationId(905)],
+                output: DeclarationId(128),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(428))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30705,19 +30849,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/computation.dag", 6513, 6572),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 24054, 24307),
         });
         declarations.push(Declaration {
-            id: DeclarationId(945),
-            name: Some("constant_bound_value".to_string()),
+            id: DeclarationId(934),
+            name: Some("reduce_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(933)],
-                output: DeclarationId(1823),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/computation.dag",
-                    6715,
-                    6980,
-                )),
+                inputs: vec![DeclarationId(1767)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(440))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30727,26 +30867,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/computation.dag", 6665, 6980),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 25092, 25363),
         });
         declarations.push(Declaration {
-            id: DeclarationId(946),
-            name: Some("IterationDimension".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "TreeDescent".to_string(),
-                        ty: DeclarationId(1849),
-                    },
-                    Field {
-                        label: "CollectionFold".to_string(),
-                        ty: DeclarationId(1850),
-                    },
-                    Field {
-                        label: "ArithmeticRepeat".to_string(),
-                        ty: DeclarationId(1851),
-                    },
-                ],
+            id: DeclarationId(935),
+            name: Some("wrap_sum".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1768)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(452))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30756,19 +30885,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/computation.dag", 7465, 7648),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 25365, 25640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(947),
-            name: Some("algebra_profile_to_dimension".to_string()),
+            id: DeclarationId(936),
+            name: Some("reduce_product".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(53)],
-                output: DeclarationId(1824),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/computation.dag",
-                    7781,
-                    8274,
-                )),
+                inputs: vec![DeclarationId(1769)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(469))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30778,19 +30903,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/computation.dag", 7701, 8274),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 25825, 26246),
         });
         declarations.push(Declaration {
-            id: DeclarationId(948),
-            name: Some("type_iteration_dimension".to_string()),
+            id: DeclarationId(937),
+            name: Some("combine_binary_product".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(230)],
-                output: DeclarationId(1825),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/computation.dag",
-                    8346,
-                    8565,
-                )),
+                inputs: vec![DeclarationId(905), DeclarationId(905)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(478))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30800,22 +30921,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/computation.dag", 8276, 8565),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 26411, 26798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(949),
-            name: Some("Mutability".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Immutable".to_string(),
-                        ty: DeclarationId(1852),
-                    },
-                    Field {
-                        label: "Mutable".to_string(),
-                        ty: DeclarationId(1853),
-                    },
-                ],
+            id: DeclarationId(938),
+            name: Some("combine_linear_with".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(901), DeclarationId(905), DeclarationId(905)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(487))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30825,22 +30939,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/computation_model.dag", 340, 381),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 26800, 27209),
         });
         declarations.push(Declaration {
-            id: DeclarationId(950),
-            name: Some("Purity".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Pure".to_string(),
-                        ty: DeclarationId(1854),
-                    },
-                    Field {
-                        label: "Effectful".to_string(),
-                        ty: DeclarationId(1855),
-                    },
+            id: DeclarationId(939),
+            name: Some("collapse_linear_square".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![
+                    DeclarationId(901),
+                    DeclarationId(901),
+                    DeclarationId(905),
+                    DeclarationId(905),
                 ],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(492))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30850,22 +30962,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/computation_model.dag", 598, 632),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 27211, 27427),
         });
         declarations.push(Declaration {
-            id: DeclarationId(951),
-            name: Some("Structure".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "ExplicitDAG".to_string(),
-                        ty: DeclarationId(1856),
-                    },
-                    Field {
-                        label: "Arbitrary".to_string(),
-                        ty: DeclarationId(1857),
-                    },
-                ],
+            id: DeclarationId(940),
+            name: Some("polynomial_square".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(901)],
+                output: DeclarationId(905),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 27483, 27533)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30875,22 +30980,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/computation_model.dag", 891, 935),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 27429, 27533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(952),
-            name: Some("Iteration".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Bounded".to_string(),
-                        ty: DeclarationId(1858),
-                    },
-                    Field {
-                        label: "Unbounded".to_string(),
-                        ty: DeclarationId(1859),
-                    },
-                ],
+            id: DeclarationId(941),
+            name: Some("product_pair".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(905), DeclarationId(905)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(495))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30900,30 +30998,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/computation_model.dag", 1147, 1187),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 27535, 27633),
         });
         declarations.push(Declaration {
-            id: DeclarationId(953),
-            name: Some("ComputationModel".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "mutability".to_string(),
-                        ty: DeclarationId(949),
-                    },
-                    Field {
-                        label: "purity".to_string(),
-                        ty: DeclarationId(950),
-                    },
-                    Field {
-                        label: "structure".to_string(),
-                        ty: DeclarationId(951),
-                    },
-                    Field {
-                        label: "iteration".to_string(),
-                        ty: DeclarationId(952),
-                    },
-                ],
+            id: DeclarationId(942),
+            name: Some("fold_or_dominate_scan".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(906), DeclarationId(905)],
+                output: DeclarationId(906),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(502))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -30933,76 +31016,100 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 1387, 1500),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 27635, 27784),
         });
         declarations.push(Declaration {
-            id: DeclarationId(954),
-            name: Some("dag_model".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(953),
-                arguments: vec![],
+            id: DeclarationId(943),
+            name: Some("scan_hit".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(906)],
+                output: DeclarationId(128),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(504))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(953)),
+            meta_tag: None,
             specialization_parent: None,
             inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "mutability".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1852),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "purity".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1854),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "structure".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1856),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "iteration".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1858),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 1502, 1625),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 27786, 27841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(955),
-            name: Some("MemoryModel".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
+            id: DeclarationId(944),
+            name: Some("filter_not_dominated_by".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1770), DeclarationId(905)],
+                output: DeclarationId(1771),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(517))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 27843, 28205),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(945),
+            name: Some("drop_dominated_step".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1772), DeclarationId(905)],
+                output: DeclarationId(1773),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(524))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 28207, 28449),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(946),
+            name: Some("drop_dominated".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1774)],
+                output: DeclarationId(1775),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(527))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 28637, 28749),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(947),
+            name: Some("ResourceHandle".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
                     Field {
-                        label: "ValueOnly".to_string(),
-                        ty: DeclarationId(1860),
+                        label: "type".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(1861),
+                        label: "resource_id".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "RefCounted".to_string(),
-                        ty: DeclarationId(1862),
+                        label: "key".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(1863),
+                        label: "cap".to_string(),
+                        ty: DeclarationId(147),
                     },
                 ],
             },
@@ -31014,22 +31121,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/computation_model.dag", 2014, 2099),
+            span: SourceSpan::new("src/v3/std/resources.dag", 739, 827),
         });
         declarations.push(Declaration {
-            id: DeclarationId(956),
-            name: Some("ScopeModel".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "LexicalScoping".to_string(),
-                        ty: DeclarationId(1864),
-                    },
-                    Field {
-                        label: "DynamicScoping".to_string(),
-                        ty: DeclarationId(1865),
-                    },
-                ],
+            id: DeclarationId(948),
+            name: Some("ResourceReference".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "target".to_string(),
+                    ty: DeclarationId(1314),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -31039,20 +31140,34 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 2365, 2418),
+            span: SourceSpan::new("src/v3/std/resources.dag", 829, 880),
         });
         declarations.push(Declaration {
-            id: DeclarationId(957),
-            name: Some("TargetExecutionModel".to_string()),
+            id: DeclarationId(949),
+            name: Some("InputField".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/services.dag", 3669, 3687),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(950),
+            name: Some("RestEndpointBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "memory".to_string(),
-                        ty: DeclarationId(955),
+                        label: "method".to_string(),
+                        ty: DeclarationId(198),
                     },
                     Field {
-                        label: "scope".to_string(),
-                        ty: DeclarationId(956),
+                        label: "path".to_string(),
+                        ty: DeclarationId(730),
                     },
                 ],
             },
@@ -31064,15 +31179,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/computation_model.dag", 2561, 2632),
+            span: SourceSpan::new("src/v3/std/services.dag", 4599, 4671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(958),
-            name: Some("SourceFiltering".to_string()),
+            id: DeclarationId(951),
+            name: Some("CallableRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
-                    label: "excluded_prefixes".to_string(),
-                    ty: DeclarationId(1866),
+                    label: "decl".to_string(),
+                    ty: DeclarationId(1314),
                 }],
             },
             type_params: vec![],
@@ -31083,20 +31198,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/computation_model.dag", 2774, 2832),
+            span: SourceSpan::new("src/v3/std/services.dag", 5479, 5522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(959),
-            name: Some("ShapeATargetSourceFiltering".to_string()),
+            id: DeclarationId(952),
+            name: Some("Operation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "internal".to_string(),
-                        ty: DeclarationId(958),
+                        label: "callable".to_string(),
+                        ty: DeclarationId(951),
                     },
                     Field {
-                        label: "additional_excluded_prefixes".to_string(),
-                        ty: DeclarationId(1867),
+                        label: "inputs".to_string(),
+                        ty: DeclarationId(1835),
+                    },
+                    Field {
+                        label: "endpoint".to_string(),
+                        ty: DeclarationId(950),
                     },
                 ],
             },
@@ -31108,47 +31227,64 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 3115, 3224),
+            span: SourceSpan::new("src/v3/std/services.dag", 6731, 6841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(960),
-            name: Some("internal_source_filtering".to_string()),
+            id: DeclarationId(953),
+            name: Some("anthropic_operations".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(958),
-                arguments: vec![],
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(952),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(958)),
+            meta_tag: Some(DeclarationId(1836)),
             specialization_parent: None,
             inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![(
-                    "excluded_prefixes".to_string(),
-                    FieldValue::List(vec![
-                        FieldValue::Literal(LiteralBits::String("dsl/std/".to_string())),
-                        FieldValue::Literal(LiteralBits::String("dsl/extdeps/".to_string())),
-                        FieldValue::Literal(LiteralBits::String("src/v3/std/".to_string())),
-                        FieldValue::Literal(LiteralBits::String("src/v3/spec/".to_string())),
-                    ]),
-                )],
-            }),
+            value_body: Some(ValueBody::List(vec![])),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 3226, 3381),
+            span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6519, 6566),
         });
         declarations.push(Declaration {
-            id: DeclarationId(961),
-            name: Some("ExecutionModelRequirement".to_string()),
+            id: DeclarationId(954),
+            name: Some("SizeBound".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(1868),
+                        label: "CollectionSize".to_string(),
+                        ty: DeclarationId(1843),
                     },
                     Field {
-                        label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(1869),
+                        label: "ParserStreamSize".to_string(),
+                        ty: DeclarationId(1844),
+                    },
+                    Field {
+                        label: "WorklistDrainSize".to_string(),
+                        ty: DeclarationId(1845),
+                    },
+                    Field {
+                        label: "TreeSize".to_string(),
+                        ty: DeclarationId(1846),
+                    },
+                    Field {
+                        label: "ArithmeticParam".to_string(),
+                        ty: DeclarationId(1847),
+                    },
+                    Field {
+                        label: "ExplicitCountZero".to_string(),
+                        ty: DeclarationId(1848),
+                    },
+                    Field {
+                        label: "ExplicitCountPositive".to_string(),
+                        ty: DeclarationId(1849),
+                    },
+                    Field {
+                        label: "Forever".to_string(),
+                        ty: DeclarationId(1850),
                     },
                 ],
             },
@@ -31160,14 +31296,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 3659, 3729),
+            span: SourceSpan::new("src/v3/std/computation.dag", 1411, 1707),
         });
         declarations.push(Declaration {
-            id: DeclarationId(962),
-            name: Some("VariantId".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(230),
-                arguments: vec![],
+            id: DeclarationId(955),
+            name: Some("tree_size_bound".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(954),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/computation.dag",
+                    1756,
+                    1787,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -31177,16 +31318,46 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 5139, 5162),
+            span: SourceSpan::new("src/v3/std/computation.dag", 1709, 1787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(963),
-            name: Some("WireTagValue".to_string()),
+            id: DeclarationId(956),
+            name: Some("CallPattern".to_string()),
             connective: TypeConnective::Disj {
-                variants: vec![Field {
-                    label: "StringTag".to_string(),
-                    ty: DeclarationId(1870),
-                }],
+                variants: vec![
+                    Field {
+                        label: "ChildAccessorCall".to_string(),
+                        ty: DeclarationId(1851),
+                    },
+                    Field {
+                        label: "CollectionShrinkCall".to_string(),
+                        ty: DeclarationId(1852),
+                    },
+                    Field {
+                        label: "ArithmeticSubtractCall".to_string(),
+                        ty: DeclarationId(1853),
+                    },
+                    Field {
+                        label: "ArithmeticDivideCall".to_string(),
+                        ty: DeclarationId(1854),
+                    },
+                    Field {
+                        label: "ParserAdvanceCall".to_string(),
+                        ty: DeclarationId(1855),
+                    },
+                    Field {
+                        label: "WorklistDrainCall".to_string(),
+                        ty: DeclarationId(1856),
+                    },
+                    Field {
+                        label: "FoldBodyCall".to_string(),
+                        ty: DeclarationId(1857),
+                    },
+                    Field {
+                        label: "SameArgumentCall".to_string(),
+                        ty: DeclarationId(1858),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -31196,20 +31367,68 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 6737, 6786),
+            span: SourceSpan::new("src/v3/std/computation.dag", 2038, 2485),
         });
         declarations.push(Declaration {
-            id: DeclarationId(964),
-            name: Some("FieldProjection".to_string()),
+            id: DeclarationId(957),
+            name: Some("per_call_pattern_at".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(721)],
+                output: DeclarationId(1837),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/computation.dag",
+                    2764,
+                    2794,
+                )),
+            },
+            type_params: vec![],
+            phantom_params: 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", 2698, 2794),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(958),
+            name: Some("per_call_descent_operand_port".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(721)],
+                output: DeclarationId(1838),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/computation.dag",
+                    2969,
+                    3009,
+                )),
+            },
+            type_params: vec![],
+            phantom_params: 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", 2898, 3009),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(959),
+            name: Some("ShrinkFactor".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "Empty".to_string(),
-                        ty: DeclarationId(1871),
+                        label: "UnitShrink".to_string(),
+                        ty: DeclarationId(1859),
                     },
                     Field {
-                        label: "Populated".to_string(),
-                        ty: DeclarationId(1872),
+                        label: "ConstantShrink".to_string(),
+                        ty: DeclarationId(1860),
+                    },
+                    Field {
+                        label: "ProportionalShrink".to_string(),
+                        ty: DeclarationId(1861),
                     },
                 ],
             },
@@ -31221,20 +31440,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/coproduct_projection.dag", 7586, 7630),
+            span: SourceSpan::new("src/v3/std/computation.dag", 3199, 3339),
         });
         declarations.push(Declaration {
-            id: DeclarationId(965),
-            name: Some("CoproductVariantProjection".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
+            id: DeclarationId(960),
+            name: Some("IterationPrimitive".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "field_projection".to_string(),
-                        ty: DeclarationId(964),
+                        label: "Fold".to_string(),
+                        ty: DeclarationId(1862),
                     },
                     Field {
-                        label: "wire_tag_value".to_string(),
-                        ty: DeclarationId(963),
+                        label: "Descend".to_string(),
+                        ty: DeclarationId(1863),
+                    },
+                    Field {
+                        label: "Repeat".to_string(),
+                        ty: DeclarationId(1864),
                     },
                 ],
             },
@@ -31246,24 +31469,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/coproduct_projection.dag", 8046, 8150),
+            span: SourceSpan::new("src/v3/std/computation.dag", 3501, 3556),
         });
         declarations.push(Declaration {
-            id: DeclarationId(966),
-            name: Some("CoproductProjection".to_string()),
+            id: DeclarationId(961),
+            name: Some("LoweringTarget".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "declaration".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "primitive".to_string(),
+                        ty: DeclarationId(960),
                     },
                     Field {
-                        label: "wire_tag_field".to_string(),
-                        ty: DeclarationId(230),
+                        label: "bound".to_string(),
+                        ty: DeclarationId(954),
                     },
                     Field {
-                        label: "variant_projections".to_string(),
-                        ty: DeclarationId(1873),
+                        label: "evidence".to_string(),
+                        ty: DeclarationId(1124),
+                    },
+                    Field {
+                        label: "factor".to_string(),
+                        ty: DeclarationId(1865),
                     },
                 ],
             },
@@ -31275,14 +31502,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 9395, 9557),
+            span: SourceSpan::new("src/v3/std/computation.dag", 3748, 3874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(967),
-            name: Some("ShapeATarget".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1051),
-                arguments: vec![],
+            id: DeclarationId(962),
+            name: Some("lower_call_pattern".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(956)],
+                output: DeclarationId(961),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/computation.dag",
+                    4185,
+                    5736,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -31292,99 +31524,268 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 2839, 2871),
+            span: SourceSpan::new("src/v3/std/computation.dag", 4123, 5736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(968),
-            name: Some("rust_shape_a_target".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(967),
-                arguments: vec![],
+            id: DeclarationId(963),
+            name: Some("size_bound_param".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(954)],
+                output: DeclarationId(1839),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/computation.dag",
+                    5787,
+                    6212,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(967)),
+            meta_tag: None,
             specialization_parent: None,
             inhabits: None,
-            value_body: Some(ValueBody::Unparsed(SourceSpan::new(
-                "src/v3/std/cross_target_coverage.dag",
-                2914,
-                2927,
-            ))),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 2873, 2927),
+            span: SourceSpan::new("src/v3/std/computation.dag", 5738, 6212),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(964),
+            name: Some("is_constant_bound".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(954)],
+                output: DeclarationId(128),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/computation.dag",
+                    6261,
+                    6432,
+                )),
+            },
+            type_params: vec![],
+            phantom_params: 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", 6214, 6432),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(965),
+            name: Some("forever_iteration_bound".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![],
+                output: DeclarationId(93),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/computation.dag",
+                    6549,
+                    6572,
+                )),
+            },
+            type_params: vec![],
+            phantom_params: 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", 6513, 6572),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(966),
+            name: Some("constant_bound_value".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(954)],
+                output: DeclarationId(1840),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/computation.dag",
+                    6715,
+                    6980,
+                )),
+            },
+            type_params: vec![],
+            phantom_params: 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", 6665, 6980),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(967),
+            name: Some("IterationDimension".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "TreeDescent".to_string(),
+                        ty: DeclarationId(1866),
+                    },
+                    Field {
+                        label: "CollectionFold".to_string(),
+                        ty: DeclarationId(1867),
+                    },
+                    Field {
+                        label: "ArithmeticRepeat".to_string(),
+                        ty: DeclarationId(1868),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: 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", 7465, 7648),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(968),
+            name: Some("algebra_profile_to_dimension".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(53)],
+                output: DeclarationId(1841),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/computation.dag",
+                    7781,
+                    8274,
+                )),
+            },
+            type_params: vec![],
+            phantom_params: 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", 7701, 8274),
         });
         declarations.push(Declaration {
             id: DeclarationId(969),
-            name: Some("python_shape_a_target".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(967),
-                arguments: vec![],
+            name: Some("type_iteration_dimension".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(1842),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/computation.dag",
+                    8346,
+                    8565,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(967)),
+            meta_tag: None,
             specialization_parent: None,
             inhabits: None,
-            value_body: Some(ValueBody::Unparsed(SourceSpan::new(
-                "src/v3/std/cross_target_coverage.dag",
-                2971,
-                2986,
-            ))),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 2928, 2986),
+            span: SourceSpan::new("src/v3/std/computation.dag", 8276, 8565),
         });
         declarations.push(Declaration {
             id: DeclarationId(970),
-            name: Some("go_shape_a_target".to_string()),
+            name: Some("EmissionRule".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(967),
+                template: DeclarationId(230),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(967)),
+            meta_tag: None,
             specialization_parent: None,
             inhabits: None,
-            value_body: Some(ValueBody::Unparsed(SourceSpan::new(
-                "src/v3/std/cross_target_coverage.dag",
-                3026,
-                3037,
-            ))),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 2987, 3037),
+            span: SourceSpan::new("src/v3/std/emission_provenance.dag", 2797, 2823),
         });
         declarations.push(Declaration {
             id: DeclarationId(971),
-            name: Some("FormAxis".to_string()),
+            name: Some("OptionalSourceSpan".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "Atom".to_string(),
-                        ty: DeclarationId(1874),
+                        label: "NoSourceSpan".to_string(),
+                        ty: DeclarationId(1869),
                     },
                     Field {
-                        label: "Conj".to_string(),
-                        ty: DeclarationId(1875),
+                        label: "SomeSourceSpan".to_string(),
+                        ty: DeclarationId(1870),
                     },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3681, 3762),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(972),
+            name: Some("EmissionProvenance".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
                     Field {
-                        label: "Disj".to_string(),
-                        ty: DeclarationId(1876),
+                        label: "emitted_line".to_string(),
+                        ty: DeclarationId(98),
                     },
                     Field {
-                        label: "Arrow".to_string(),
-                        ty: DeclarationId(1877),
+                        label: "rule".to_string(),
+                        ty: DeclarationId(970),
                     },
                     Field {
-                        label: "Cardinality".to_string(),
-                        ty: DeclarationId(1878),
+                        label: "source_span".to_string(),
+                        ty: DeclarationId(971),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/emission_provenance.dag", 4898, 5008),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(973),
+            name: Some("TypeRealization".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "language".to_string(),
+                        ty: DeclarationId(1314),
                     },
                     Field {
-                        label: "Instantiation".to_string(),
-                        ty: DeclarationId(1879),
+                        label: "target".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "carrier".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "is_copy".to_string(),
+                        ty: DeclarationId(128),
+                    },
+                    Field {
+                        label: "fields".to_string(),
+                        ty: DeclarationId(1871),
+                    },
+                    Field {
+                        label: "cost".to_string(),
+                        ty: DeclarationId(93),
                     },
                 ],
             },
@@ -31396,32 +31797,90 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3837, 3909),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 736, 887),
         });
         declarations.push(Declaration {
-            id: DeclarationId(972),
-            name: Some("BehaviorAxis".to_string()),
+            id: DeclarationId(974),
+            name: Some("TargetIntegerTypeInhabitance".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "language".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "kernel_integer".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "algebra".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "bound".to_string(),
+                        ty: DeclarationId(975),
+                    },
+                    Field {
+                        label: "type_realization".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: 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", 2385, 2840),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(975),
+            name: Some("TargetIntegerInhabitanceBound".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "Value".to_string(),
-                        ty: DeclarationId(1880),
+                        label: "BoundUnspecified".to_string(),
+                        ty: DeclarationId(1872),
                     },
                     Field {
-                        label: "Transform".to_string(),
-                        ty: DeclarationId(1881),
+                        label: "StaticBoundFact".to_string(),
+                        ty: DeclarationId(1873),
                     },
                     Field {
-                        label: "Branch".to_string(),
-                        ty: DeclarationId(1882),
+                        label: "PlatformDependentFact".to_string(),
+                        ty: DeclarationId(1874),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: 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", 4334, 4686),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(976),
+            name: Some("FieldBinding".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "dag_name".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "Loop".to_string(),
-                        ty: DeclarationId(1883),
+                        label: "access".to_string(),
+                        ty: DeclarationId(977),
                     },
                     Field {
-                        label: "Bind".to_string(),
-                        ty: DeclarationId(1884),
+                        label: "borrowed_read".to_string(),
+                        ty: DeclarationId(128),
                     },
                 ],
             },
@@ -31433,20 +31892,57 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4469, 4529),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 4688, 4772),
         });
         declarations.push(Declaration {
-            id: DeclarationId(973),
-            name: Some("MethodTemplateContractKey".to_string()),
+            id: DeclarationId(977),
+            name: Some("FieldAccess".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "DirectField".to_string(),
+                        ty: DeclarationId(1875),
+                    },
+                    Field {
+                        label: "AccessorMethod".to_string(),
+                        ty: DeclarationId(1876),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: 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", 5155, 5222),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(978),
+            name: Some("OperatorRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
+                    Field {
+                        label: "language".to_string(),
+                        ty: DeclarationId(1314),
+                    },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(967),
+                        ty: DeclarationId(1314),
                     },
                     Field {
-                        label: "dag_method".to_string(),
-                        ty: DeclarationId(841),
+                        label: "op".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "carrier".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "cost".to_string(),
+                        ty: DeclarationId(93),
                     },
                 ],
             },
@@ -31458,20 +31954,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/cross_target_coverage.dag", 4913, 4994),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 5224, 5355),
         });
         declarations.push(Declaration {
-            id: DeclarationId(974),
-            name: Some("EmissionCell".to_string()),
+            id: DeclarationId(979),
+            name: Some("BehaviorRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "connective".to_string(),
-                        ty: DeclarationId(971),
+                        label: "language".to_string(),
+                        ty: DeclarationId(1314),
                     },
                     Field {
-                        label: "behavior".to_string(),
-                        ty: DeclarationId(972),
+                        label: "target".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "carrier".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "cost".to_string(),
+                        ty: DeclarationId(93),
                     },
                 ],
             },
@@ -31483,20 +31987,32 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5427, 5496),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 5357, 5467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(975),
-            name: Some("EmissionPathProjection".to_string()),
+            id: DeclarationId(980),
+            name: Some("CallableRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "row_identity".to_string(),
-                        ty: DeclarationId(973),
+                        label: "language".to_string(),
+                        ty: DeclarationId(1314),
                     },
                     Field {
-                        label: "cells".to_string(),
-                        ty: DeclarationId(1885),
+                        label: "target".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "strategy".to_string(),
+                        ty: DeclarationId(989),
+                    },
+                    Field {
+                        label: "parameters".to_string(),
+                        ty: DeclarationId(1877),
+                    },
+                    Field {
+                        label: "cost".to_string(),
+                        ty: DeclarationId(93),
                     },
                 ],
             },
@@ -31508,1688 +32024,45 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5842, 5943),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 5469, 5628),
         });
         declarations.push(Declaration {
-            id: DeclarationId(976),
-            name: Some("emission_path_projections".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(975),
-                }],
+            id: DeclarationId(981),
+            name: Some("CallableParameter".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "slot".to_string(),
+                        ty: DeclarationId(93),
+                    },
+                    Field {
+                        label: "disposition".to_string(),
+                        ty: DeclarationId(982),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1886)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::List(vec![
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(968)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(258)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(968)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(271)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(968)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(295)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(968)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(273)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(968)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(264)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(968)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(262)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(968)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(252)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(968)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(263)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(968)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(249)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(968)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(248)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(968)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(265)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(968)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(293)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(968)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(299)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(258)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(271)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(295)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(273)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(264)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(262)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(252)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(263)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(249)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(248)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(265)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(293)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(299)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(294)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(250)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(969)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(297)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(970)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(258)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(970)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(271)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(970)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(295)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(970)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(263)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(970)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(249)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(970)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(248)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(970)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(265)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(970)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(293)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(970)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(299)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(970)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(294)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(970)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(250)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "row_identity".to_string(),
-                        FieldValue::Record(vec![
-                            (
-                                "target".to_string(),
-                                FieldValue::Reference(DeclarationId(970)),
-                            ),
-                            (
-                                "dag_method".to_string(),
-                                FieldValue::Record(vec![(
-                                    "decl".to_string(),
-                                    FieldValue::Reference(DeclarationId(297)),
-                                )]),
-                            ),
-                        ]),
-                    ),
-                    (
-                        "cells".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "connective".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1878),
-                                    payload: vec![],
-                                },
-                            ),
-                            (
-                                "behavior".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(1881),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                ]),
-            ])),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6364, 12528),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(977),
-            name: Some("CompilerDiagnosticKind".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "TokenizerError".to_string(),
-                        ty: DeclarationId(1887),
-                    },
-                    Field {
-                        label: "ParseError".to_string(),
-                        ty: DeclarationId(1888),
-                    },
-                    Field {
-                        label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(1889),
-                    },
-                    Field {
-                        label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(1890),
-                    },
-                    Field {
-                        label: "ResolveError".to_string(),
-                        ty: DeclarationId(1891),
-                    },
-                    Field {
-                        label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(1892),
-                    },
-                    Field {
-                        label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(1893),
-                    },
-                    Field {
-                        label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(1894),
-                    },
-                    Field {
-                        label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(1895),
-                    },
-                    Field {
-                        label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(1896),
-                    },
-                ],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1067, 1306),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(978),
-            name: Some("Correction".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "description".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                    Field {
-                        label: "new_source".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/diagnostics.dag", 1512, 1765),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(979),
-            name: Some("DiagnosticKindDecl".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "payload".to_string(),
-                        ty: DeclarationId(778),
-                    },
-                ],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 2545, 2608),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(980),
-            name: Some("LensInstanceKindWitness".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "kind_decl".to_string(),
-                    ty: DeclarationId(1300),
-                }],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: None,
             specialization_parent: None,
             inhabits: None,
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 4810, 4870),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 6050, 6124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(981),
-            name: Some("AnyDiagnosticKind".to_string()),
+            id: DeclarationId(982),
+            name: Some("ParameterDisposition".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "CompilerKind".to_string(),
-                        ty: DeclarationId(1897),
+                        label: "Borrowed".to_string(),
+                        ty: DeclarationId(1878),
                     },
                     Field {
-                        label: "LensInstanceKind".to_string(),
-                        ty: DeclarationId(1898),
+                        label: "Consumed".to_string(),
+                        ty: DeclarationId(1879),
                     },
                 ],
             },
@@ -33201,28 +32074,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/diagnostics.dag", 5479, 5588),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 6581, 6632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(982),
-            name: Some("Diagnostic".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "kind".to_string(),
-                        ty: DeclarationId(981),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
+            id: DeclarationId(983),
+            name: Some("StringOwnershipAxis".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "message".to_string(),
-                        ty: DeclarationId(230),
+                        label: "Owned".to_string(),
+                        ty: DeclarationId(1880),
                     },
                     Field {
-                        label: "fixes".to_string(),
-                        ty: DeclarationId(1899),
+                        label: "Borrowed".to_string(),
+                        ty: DeclarationId(1881),
                     },
                 ],
             },
@@ -33234,40 +32099,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/diagnostics.dag", 5957, 6065),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 7044, 7091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(983),
-            name: Some("EmissionDiagnostic".to_string()),
+            id: DeclarationId(984),
+            name: Some("StringLifetimeAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "UnderRefined".to_string(),
-                        ty: DeclarationId(1900),
-                    },
-                    Field {
-                        label: "NoInhabitant".to_string(),
-                        ty: DeclarationId(1901),
-                    },
-                    Field {
-                        label: "ContradictoryUse".to_string(),
-                        ty: DeclarationId(1903),
-                    },
-                    Field {
-                        label: "OutOfR2Scope".to_string(),
-                        ty: DeclarationId(1904),
-                    },
-                    Field {
-                        label: "LifetimeProgramExtractionPending".to_string(),
-                        ty: DeclarationId(1905),
-                    },
-                    Field {
-                        label: "FoldNotImplemented".to_string(),
-                        ty: DeclarationId(1906),
+                        label: "SelfContained".to_string(),
+                        ty: DeclarationId(1882),
                     },
                     Field {
-                        label: "MissingEmissionPath".to_string(),
-                        ty: DeclarationId(1907),
+                        label: "Caller".to_string(),
+                        ty: DeclarationId(1883),
                     },
                 ],
             },
@@ -33279,37 +32124,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 8699, 11469),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 7399, 7451),
         });
         declarations.push(Declaration {
-            id: DeclarationId(984),
-            name: Some("Witness".to_string()),
+            id: DeclarationId(985),
+            name: Some("StringGrowabilityAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "Inhabits".to_string(),
-                        ty: DeclarationId(1922),
+                        label: "Growable".to_string(),
+                        ty: DeclarationId(1884),
                     },
                     Field {
-                        label: "Violates".to_string(),
-                        ty: DeclarationId(1923),
+                        label: "Fixed".to_string(),
+                        ty: DeclarationId(1885),
+                    },
+                    Field {
+                        label: "NotApplicable".to_string(),
+                        ty: DeclarationId(1886),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(985)],
-            phantom_params: 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", 1608, 1697),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(985),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -33318,22 +32153,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/dimensions.dag", 1608, 1697),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 7678, 7745),
         });
         declarations.push(Declaration {
             id: DeclarationId(986),
-            name: Some("OptionalDiagnostic".to_string()),
+            name: Some("StringEncodingAxis".to_string()),
             connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "NoDiagnostic".to_string(),
-                        ty: DeclarationId(1924),
-                    },
-                    Field {
-                        label: "SomeDiagnostic".to_string(),
-                        ty: DeclarationId(1925),
-                    },
-                ],
+                variants: vec![Field {
+                    label: "Utf8FreeMonoidChar".to_string(),
+                    ty: DeclarationId(1887),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -33343,37 +32172,43 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 1851, 1932),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 8054, 8100),
         });
         declarations.push(Declaration {
             id: DeclarationId(987),
-            name: Some("DimensionReport".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
+            name: Some("StringFamilyInhabitanceRow".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
                     Field {
-                        label: "DimensionOk".to_string(),
-                        ty: DeclarationId(1928),
+                        label: "language".to_string(),
+                        ty: DeclarationId(1314),
                     },
                     Field {
-                        label: "DimensionFail".to_string(),
-                        ty: DeclarationId(1932),
+                        label: "target_type".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "type_realization".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "ownership".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "lifetime".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "growability".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "encoding".to_string(),
+                        ty: DeclarationId(1314),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(988)],
-            phantom_params: 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", 2291, 2567),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(988),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -33382,329 +32217,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 2291, 2567),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 8684, 8923),
         });
         declarations.push(Declaration {
-            id: DeclarationId(989),
-            name: Some("AnalysisDimension".to_string()),
+            id: DeclarationId(988),
+            name: Some("TypeInstantiationRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
+                        label: "language".to_string(),
+                        ty: DeclarationId(1314),
                     },
                     Field {
-                        label: "witness_of".to_string(),
-                        ty: DeclarationId(1934),
+                        label: "target".to_string(),
+                        ty: DeclarationId(1314),
                     },
                     Field {
-                        label: "compose".to_string(),
-                        ty: DeclarationId(1935),
+                        label: "carrier".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "break_diagnostic".to_string(),
-                        ty: DeclarationId(1936),
+                        label: "cost".to_string(),
+                        ty: DeclarationId(93),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(990)],
-            phantom_params: 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", 3818, 4011),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(990),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 3818, 4011),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(991),
-            name: Some("Dimension".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "value".to_string(),
-                    ty: DeclarationId(993),
-                }],
-            },
-            type_params: vec![DeclarationId(992), DeclarationId(993)],
-            phantom_params: vec![PhantomParameter {
-                parameter: DeclarationId(992),
-                algebra: DeclarationId(1937),
-            }],
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(992),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(993),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(994),
-            name: Some("Meters".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/dimensions.dag", 4704, 4715),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(995),
-            name: Some("Seconds".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/dimensions.dag", 4716, 4728),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(996),
-            name: Some("Kilograms".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/dimensions.dag", 4729, 4743),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(997),
-            name: Some("Amperes".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/dimensions.dag", 4744, 4756),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(998),
-            name: Some("Kelvin".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/dimensions.dag", 4757, 4768),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(999),
-            name: Some("Moles".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/dimensions.dag", 4769, 4779),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1000),
-            name: Some("Candela".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/dimensions.dag", 4780, 4792),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1001),
-            name: Some("add_dimension".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![
-                    DeclarationId(1908),
-                    DeclarationId(1909),
-                    DeclarationId(1910),
-                ],
-                output: DeclarationId(1911),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4966, 4988)),
-            },
-            type_params: vec![DeclarationId(1002), DeclarationId(1003)],
-            phantom_params: 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", 4794, 4988),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1002),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4794, 4988),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1003),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4794, 4988),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1004),
-            name: Some("sub_dimension".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![
-                    DeclarationId(1912),
-                    DeclarationId(1913),
-                    DeclarationId(1914),
-                ],
-                output: DeclarationId(1915),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5162, 5184)),
-            },
-            type_params: vec![DeclarationId(1005), DeclarationId(1006)],
-            phantom_params: 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", 4990, 5184),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1005),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4990, 5184),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1006),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4990, 5184),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1007),
-            name: Some("mul_dimension_scalar".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![
-                    DeclarationId(1916),
-                    DeclarationId(1917),
-                    DeclarationId(1009),
-                ],
-                output: DeclarationId(1918),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5350, 5379)),
-            },
-            type_params: vec![DeclarationId(1008), DeclarationId(1009)],
-            phantom_params: 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", 5186, 5379),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1008),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -33713,12 +32250,55 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 5186, 5379),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 8925, 9044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1009),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
+            id: DeclarationId(989),
+            name: Some("CallableStrategy".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "ListEmpty".to_string(),
+                        ty: DeclarationId(1888),
+                    },
+                    Field {
+                        label: "ListSingleton".to_string(),
+                        ty: DeclarationId(1889),
+                    },
+                    Field {
+                        label: "ListCons".to_string(),
+                        ty: DeclarationId(1890),
+                    },
+                    Field {
+                        label: "ListConcat".to_string(),
+                        ty: DeclarationId(1891),
+                    },
+                    Field {
+                        label: "ListLength".to_string(),
+                        ty: DeclarationId(1892),
+                    },
+                    Field {
+                        label: "ListIsEmpty".to_string(),
+                        ty: DeclarationId(1893),
+                    },
+                    Field {
+                        label: "ListFold".to_string(),
+                        ty: DeclarationId(1894),
+                    },
+                    Field {
+                        label: "ListMap".to_string(),
+                        ty: DeclarationId(1895),
+                    },
+                    Field {
+                        label: "ListFilter".to_string(),
+                        ty: DeclarationId(1896),
+                    },
+                    Field {
+                        label: "ListContains".to_string(),
+                        ty: DeclarationId(1897),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -33727,21 +32307,60 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 5186, 5379),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 9449, 9618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1010),
-            name: Some("div_dimension_scalar".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![
-                    DeclarationId(1919),
-                    DeclarationId(1920),
-                    DeclarationId(1012),
+            id: DeclarationId(990),
+            name: Some("PatternRealization".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "language".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "target".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "strategy".to_string(),
+                        ty: DeclarationId(991),
+                    },
+                    Field {
+                        label: "empty_variant".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "cons_variant".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "scrutinee".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "empty_pattern".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "cons_pattern".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "head_expr".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "tail_expr".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "cost".to_string(),
+                        ty: DeclarationId(93),
+                    },
                 ],
-                output: DeclarationId(1921),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5545, 5574)),
             },
-            type_params: vec![DeclarationId(1011), DeclarationId(1012)],
+            type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -33749,12 +32368,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 5381, 5574),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 11557, 11846),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1011),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
+            id: DeclarationId(991),
+            name: Some("PatternStrategy".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "PlaceholderPatternStrategy".to_string(),
+                        ty: DeclarationId(1898),
+                    },
+                    Field {
+                        label: "VectorList".to_string(),
+                        ty: DeclarationId(1899),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -33763,12 +32393,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 5381, 5574),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 12286, 12352),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1012),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
+            id: DeclarationId(992),
+            name: Some("StatementSyntax".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "let_binding".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "let_binding_inferred".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -33777,14 +32418,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 5381, 5574),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 12354, 12431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1013),
-            name: Some("EmissionRule".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(230),
-                arguments: vec![],
+            id: DeclarationId(993),
+            name: Some("ExpressionSyntax".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "field_access".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "function_call".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "closure".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -33794,20 +32447,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/emission_provenance.dag", 2797, 2823),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 12433, 12523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1014),
-            name: Some("OptionalSourceSpan".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
+            id: DeclarationId(994),
+            name: Some("ForEachSyntax".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
                     Field {
-                        label: "NoSourceSpan".to_string(),
-                        ty: DeclarationId(1938),
+                        label: "prefix".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "SomeSourceSpan".to_string(),
-                        ty: DeclarationId(1939),
+                        label: "separator".to_string(),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -33819,24 +32472,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/emission_provenance.dag", 3681, 3762),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 12525, 12584),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1015),
-            name: Some("EmissionProvenance".to_string()),
+            id: DeclarationId(995),
+            name: Some("ControlFlowSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "emitted_line".to_string(),
-                        ty: DeclarationId(98),
+                        label: "if_else".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "rule".to_string(),
-                        ty: DeclarationId(1013),
+                        label: "match_arm".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "source_span".to_string(),
-                        ty: DeclarationId(1014),
+                        label: "for_each_syntax".to_string(),
+                        ty: DeclarationId(994),
                     },
                 ],
             },
@@ -33848,36 +32501,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/emission_provenance.dag", 4898, 5008),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 12586, 12683),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1016),
-            name: Some("TypeRealization".to_string()),
+            id: DeclarationId(996),
+            name: Some("LiteralSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "language".to_string(),
-                        ty: DeclarationId(1300),
-                    },
-                    Field {
-                        label: "target".to_string(),
-                        ty: DeclarationId(1300),
-                    },
-                    Field {
-                        label: "carrier".to_string(),
+                        label: "true_keyword".to_string(),
                         ty: DeclarationId(230),
                     },
                     Field {
-                        label: "is_copy".to_string(),
-                        ty: DeclarationId(128),
-                    },
-                    Field {
-                        label: "fields".to_string(),
-                        ty: DeclarationId(1940),
+                        label: "false_keyword".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "cost".to_string(),
-                        ty: DeclarationId(93),
+                        label: "string_delimiter".to_string(),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -33889,32 +32530,51 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 736, 887),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 12685, 12781),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1017),
-            name: Some("TargetIntegerTypeInhabitance".to_string()),
+            id: DeclarationId(997),
+            name: Some("ModuleSyntax".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "path_separator".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", 12783, 12829),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(998),
+            name: Some("FunctionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "language".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "definition".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "kernel_integer".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "definition_exported".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "algebra".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "definition_void".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "bound".to_string(),
-                        ty: DeclarationId(1018),
+                        label: "param_with_type".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "type_realization".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "param_separator".to_string(),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -33926,26 +32586,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/emit_model.dag", 2385, 2840),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 12831, 12983),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1018),
-            name: Some("TargetIntegerInhabitanceBound".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "BoundUnspecified".to_string(),
-                        ty: DeclarationId(1941),
-                    },
-                    Field {
-                        label: "StaticBoundFact".to_string(),
-                        ty: DeclarationId(1942),
-                    },
-                    Field {
-                        label: "PlatformDependentFact".to_string(),
-                        ty: DeclarationId(1943),
-                    },
-                ],
+            id: DeclarationId(999),
+            name: Some("TypeApplicationSyntax".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "optional".to_string(),
+                    ty: DeclarationId(230),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -33955,24 +32605,32 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 4334, 4686),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 12985, 13034),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1019),
-            name: Some("FieldBinding".to_string()),
+            id: DeclarationId(1000),
+            name: Some("TypeDefinitionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "dag_name".to_string(),
+                        label: "struct_def".to_string(),
                         ty: DeclarationId(230),
                     },
                     Field {
-                        label: "access".to_string(),
-                        ty: DeclarationId(1020),
+                        label: "struct_field".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "borrowed_read".to_string(),
-                        ty: DeclarationId(128),
+                        label: "enum_def".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "enum_unit_variant".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "enum_data_variant".to_string(),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -33984,20 +32642,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/emit_model.dag", 4688, 4772),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 13248, 13396),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1020),
-            name: Some("FieldAccess".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
+            id: DeclarationId(1001),
+            name: Some("RecordDeriveTemplateBundle".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
                     Field {
-                        label: "DirectField".to_string(),
-                        ty: DeclarationId(1944),
+                        label: "struct_def_no_debug".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "AccessorMethod".to_string(),
-                        ty: DeclarationId(1945),
+                        label: "enum_def_no_debug".to_string(),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -34009,32 +32667,44 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 5155, 5222),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 14057, 14150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1021),
-            name: Some("OperatorRealization".to_string()),
+            id: DeclarationId(1002),
+            name: Some("PatternMatchSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "language".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "match_expr".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "target".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "match_arm".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "op".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "variant_pattern".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "carrier".to_string(),
+                        label: "variant_pattern_positional".to_string(),
                         ty: DeclarationId(230),
                     },
                     Field {
-                        label: "cost".to_string(),
-                        ty: DeclarationId(93),
+                        label: "variant_pattern_empty".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "field_binding".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "field_binding_separator".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "wildcard".to_string(),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -34046,28 +32716,68 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 5224, 5355),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 14854, 15094),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1022),
-            name: Some("BehaviorRealization".to_string()),
+            id: DeclarationId(1003),
+            name: Some("CollectionOps".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "language".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "concat_contract".to_string(),
+                        ty: DeclarationId(1314),
                     },
                     Field {
-                        label: "target".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "length_contract".to_string(),
+                        ty: DeclarationId(1314),
                     },
                     Field {
-                        label: "carrier".to_string(),
+                        label: "is_empty_contract".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "fold_contract".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "filter_contract".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "flat_map_contract".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "any_contract".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "all_contract".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "map_contract".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "filter".to_string(),
                         ty: DeclarationId(230),
                     },
                     Field {
-                        label: "cost".to_string(),
-                        ty: DeclarationId(93),
+                        label: "contains".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "empty_list".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "list_literal".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "cons".to_string(),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -34079,32 +32789,32 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 5357, 5467),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 15096, 16332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1023),
-            name: Some("CallableRealization".to_string()),
+            id: DeclarationId(1004),
+            name: Some("ValueConstructionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "language".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "struct_literal".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "target".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "struct_field_init".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "strategy".to_string(),
-                        ty: DeclarationId(1032),
+                        label: "struct_field_separator".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "parameters".to_string(),
-                        ty: DeclarationId(1946),
+                        label: "variant_construction".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "cost".to_string(),
-                        ty: DeclarationId(93),
+                        label: "variant_named_construction".to_string(),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -34116,20 +32826,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/emit_model.dag", 5469, 5628),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 16334, 16520),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1024),
-            name: Some("CallableParameter".to_string()),
+            id: DeclarationId(1005),
+            name: Some("RenderingModel".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "slot".to_string(),
-                        ty: DeclarationId(93),
+                        label: "read".to_string(),
+                        ty: DeclarationId(1006),
                     },
                     Field {
-                        label: "disposition".to_string(),
-                        ty: DeclarationId(1025),
+                        label: "construct".to_string(),
+                        ty: DeclarationId(1007),
                     },
                 ],
             },
@@ -34141,20 +32851,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/emit_model.dag", 6050, 6124),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 16522, 16597),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1025),
-            name: Some("ParameterDisposition".to_string()),
+            id: DeclarationId(1006),
+            name: Some("ReadStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "Borrowed".to_string(),
-                        ty: DeclarationId(1947),
+                        label: "Borrow".to_string(),
+                        ty: DeclarationId(1900),
                     },
                     Field {
-                        label: "Consumed".to_string(),
-                        ty: DeclarationId(1948),
+                        label: "PassByValue".to_string(),
+                        ty: DeclarationId(1901),
                     },
                 ],
             },
@@ -34166,20 +32876,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/emit_model.dag", 6581, 6632),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 17095, 17139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1026),
-            name: Some("StringOwnershipAxis".to_string()),
+            id: DeclarationId(1007),
+            name: Some("ConstructStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "Owned".to_string(),
-                        ty: DeclarationId(1949),
+                        label: "CopyOrClone".to_string(),
+                        ty: DeclarationId(1902),
                     },
                     Field {
-                        label: "Borrowed".to_string(),
-                        ty: DeclarationId(1950),
+                        label: "PassByValue".to_string(),
+                        ty: DeclarationId(1903),
                     },
                 ],
             },
@@ -34191,20 +32901,60 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 7044, 7091),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 17432, 17486),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1027),
-            name: Some("StringLifetimeAxis".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
+            id: DeclarationId(1008),
+            name: Some("LanguageSpec".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
                     Field {
-                        label: "SelfContained".to_string(),
-                        ty: DeclarationId(1951),
+                        label: "statements".to_string(),
+                        ty: DeclarationId(1314),
                     },
                     Field {
-                        label: "Caller".to_string(),
-                        ty: DeclarationId(1952),
+                        label: "expressions".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "control_flow".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "literals".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "modules".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "functions".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "type_applications".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "type_definitions".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "record_derive_templates".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "patterns".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "collection_ops".to_string(),
+                        ty: DeclarationId(1314),
+                    },
+                    Field {
+                        label: "values".to_string(),
+                        ty: DeclarationId(1314),
                     },
                 ],
             },
@@ -34216,24 +32966,45 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 7399, 7451),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 17488, 18014),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1028),
-            name: Some("StringGrowabilityAxis".to_string()),
+            id: DeclarationId(1009),
+            name: Some("PlaceholderConvention".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "Growable".to_string(),
-                        ty: DeclarationId(1953),
+                        label: "IndexedArgs".to_string(),
+                        ty: DeclarationId(1904),
+                    },
+                    Field {
+                        label: "NamedArg".to_string(),
+                        ty: DeclarationId(1905),
                     },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: 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", 19388, 19443),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1010),
+            name: Some("MethodEmitTemplate".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "Fixed".to_string(),
-                        ty: DeclarationId(1954),
+                        label: "SingleTemplate".to_string(),
+                        ty: DeclarationId(1906),
                     },
                     Field {
-                        label: "NotApplicable".to_string(),
-                        ty: DeclarationId(1955),
+                        label: "HigherOrderTemplates".to_string(),
+                        ty: DeclarationId(1907),
                     },
                 ],
             },
@@ -34245,16 +33016,34 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 7678, 7745),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 20578, 20734),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1029),
-            name: Some("StringEncodingAxis".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![Field {
-                    label: "Utf8FreeMonoidChar".to_string(),
-                    ty: DeclarationId(1956),
-                }],
+            id: DeclarationId(1011),
+            name: Some("MethodTemplateContract".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "dag_method".to_string(),
+                        ty: DeclarationId(841),
+                    },
+                    Field {
+                        label: "runtime_template".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "emit_template".to_string(),
+                        ty: DeclarationId(1010),
+                    },
+                    Field {
+                        label: "wraps_result".to_string(),
+                        ty: DeclarationId(128),
+                    },
+                    Field {
+                        label: "placeholder_convention".to_string(),
+                        ty: DeclarationId(1009),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -34264,40 +33053,48 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 8054, 8100),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 22527, 22714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1030),
-            name: Some("StringFamilyInhabitanceRow".to_string()),
+            id: DeclarationId(1012),
+            name: Some("CleanEmissionContract".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "language".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "expression_wrapping".to_string(),
+                        ty: DeclarationId(1014),
                     },
                     Field {
-                        label: "target_type".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "pattern_bindings".to_string(),
+                        ty: DeclarationId(1015),
                     },
                     Field {
-                        label: "type_realization".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "variant_payload_field_access".to_string(),
+                        ty: DeclarationId(1016),
                     },
                     Field {
-                        label: "ownership".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "imports".to_string(),
+                        ty: DeclarationId(1017),
                     },
                     Field {
-                        label: "lifetime".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "block_return".to_string(),
+                        ty: DeclarationId(1018),
                     },
                     Field {
-                        label: "growability".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "variable_bindings".to_string(),
+                        ty: DeclarationId(1019),
                     },
                     Field {
-                        label: "encoding".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "match_arm_body".to_string(),
+                        ty: DeclarationId(1020),
+                    },
+                    Field {
+                        label: "correction_style".to_string(),
+                        ty: DeclarationId(1021),
+                    },
+                    Field {
+                        label: "post_emit_verifier".to_string(),
+                        ty: DeclarationId(1022),
                     },
                 ],
             },
@@ -34309,28 +33106,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/emit_model.dag", 8684, 8923),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 562, 944),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1031),
-            name: Some("TypeInstantiationRealization".to_string()),
+            id: DeclarationId(1013),
+            name: Some("TargetCleanEmissionBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1300),
-                    },
-                    Field {
-                        label: "target".to_string(),
-                        ty: DeclarationId(1300),
-                    },
-                    Field {
-                        label: "carrier".to_string(),
-                        ty: DeclarationId(230),
+                        ty: DeclarationId(1008),
                     },
                     Field {
-                        label: "cost".to_string(),
-                        ty: DeclarationId(93),
+                        label: "clean_emission".to_string(),
+                        ty: DeclarationId(1012),
                     },
                 ],
             },
@@ -34342,52 +33131,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/emit_model.dag", 8925, 9044),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 1748, 1848),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1032),
-            name: Some("CallableStrategy".to_string()),
+            id: DeclarationId(1014),
+            name: Some("ExpressionWrappingRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "ListEmpty".to_string(),
-                        ty: DeclarationId(1957),
-                    },
-                    Field {
-                        label: "ListSingleton".to_string(),
-                        ty: DeclarationId(1958),
-                    },
-                    Field {
-                        label: "ListCons".to_string(),
-                        ty: DeclarationId(1959),
-                    },
-                    Field {
-                        label: "ListConcat".to_string(),
-                        ty: DeclarationId(1960),
-                    },
-                    Field {
-                        label: "ListLength".to_string(),
-                        ty: DeclarationId(1961),
-                    },
-                    Field {
-                        label: "ListIsEmpty".to_string(),
-                        ty: DeclarationId(1962),
-                    },
-                    Field {
-                        label: "ListFold".to_string(),
-                        ty: DeclarationId(1963),
-                    },
-                    Field {
-                        label: "ListMap".to_string(),
-                        ty: DeclarationId(1964),
+                        label: "WrapEverything".to_string(),
+                        ty: DeclarationId(1908),
                     },
                     Field {
-                        label: "ListFilter".to_string(),
-                        ty: DeclarationId(1965),
+                        label: "WrapOnlyInOperandPosition".to_string(),
+                        ty: DeclarationId(1909),
                     },
                     Field {
-                        label: "ListContains".to_string(),
-                        ty: DeclarationId(1966),
+                        label: "NoWrapping".to_string(),
+                        ty: DeclarationId(1910),
                     },
                 ],
             },
@@ -34399,56 +33160,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/emit_model.dag", 9449, 9618),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 2192, 2283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1033),
-            name: Some("PatternRealization".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "language".to_string(),
-                        ty: DeclarationId(1300),
-                    },
-                    Field {
-                        label: "target".to_string(),
-                        ty: DeclarationId(1300),
-                    },
-                    Field {
-                        label: "strategy".to_string(),
-                        ty: DeclarationId(1034),
-                    },
-                    Field {
-                        label: "empty_variant".to_string(),
-                        ty: DeclarationId(1300),
-                    },
-                    Field {
-                        label: "cons_variant".to_string(),
-                        ty: DeclarationId(1300),
-                    },
-                    Field {
-                        label: "scrutinee".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "empty_pattern".to_string(),
-                        ty: DeclarationId(230),
-                    },
+            id: DeclarationId(1015),
+            name: Some("PatternBindingRule".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "cons_pattern".to_string(),
-                        ty: DeclarationId(230),
+                        label: "EmitBindingAlways".to_string(),
+                        ty: DeclarationId(1911),
                     },
                     Field {
-                        label: "head_expr".to_string(),
-                        ty: DeclarationId(230),
+                        label: "EmitUnderscoreWhenUnused".to_string(),
+                        ty: DeclarationId(1912),
                     },
                     Field {
-                        label: "tail_expr".to_string(),
-                        ty: DeclarationId(230),
+                        label: "EmitPrefixedUnderscoreWhenUnused".to_string(),
+                        ty: DeclarationId(1913),
                     },
                     Field {
-                        label: "cost".to_string(),
-                        ty: DeclarationId(93),
+                        label: "NotApplicablePatternBinding".to_string(),
+                        ty: DeclarationId(1914),
                     },
                 ],
             },
@@ -34460,20 +33193,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/emit_model.dag", 11557, 11846),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 2520, 2663),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1034),
-            name: Some("PatternStrategy".to_string()),
+            id: DeclarationId(1016),
+            name: Some("VariantPayloadFieldAccessRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "PlaceholderPatternStrategy".to_string(),
-                        ty: DeclarationId(1967),
+                        label: "AccessFromPayloadBinding".to_string(),
+                        ty: DeclarationId(1915),
                     },
                     Field {
-                        label: "VectorList".to_string(),
-                        ty: DeclarationId(1968),
+                        label: "OverrideNamedFieldsAtBindingSite".to_string(),
+                        ty: DeclarationId(1916),
                     },
                 ],
             },
@@ -34485,20 +33218,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/emit_model.dag", 12286, 12352),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3330, 3430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1035),
-            name: Some("StatementSyntax".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
+            id: DeclarationId(1017),
+            name: Some("ImportRule".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "let_binding".to_string(),
-                        ty: DeclarationId(230),
+                        label: "ImportEverythingDeclared".to_string(),
+                        ty: DeclarationId(1917),
                     },
                     Field {
-                        label: "let_binding_inferred".to_string(),
-                        ty: DeclarationId(230),
+                        label: "IncludeOnlyReferenced".to_string(),
+                        ty: DeclarationId(1918),
+                    },
+                    Field {
+                        label: "ImportPerUsageSite".to_string(),
+                        ty: DeclarationId(1919),
                     },
                 ],
             },
@@ -34510,24 +33247,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/emit_model.dag", 12354, 12431),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3544, 3637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1036),
-            name: Some("ExpressionSyntax".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
+            id: DeclarationId(1018),
+            name: Some("BlockReturnRule".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "field_access".to_string(),
-                        ty: DeclarationId(230),
+                        label: "WrapReturnValue".to_string(),
+                        ty: DeclarationId(1920),
                     },
                     Field {
-                        label: "function_call".to_string(),
-                        ty: DeclarationId(230),
+                        label: "NoWrappingOnTerminalExpression".to_string(),
+                        ty: DeclarationId(1921),
                     },
                     Field {
-                        label: "closure".to_string(),
-                        ty: DeclarationId(230),
+                        label: "ExplicitReturnKeyword".to_string(),
+                        ty: DeclarationId(1922),
                     },
                 ],
             },
@@ -34539,20 +33276,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/emit_model.dag", 12433, 12523),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3756, 3857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1037),
-            name: Some("ForEachSyntax".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
+            id: DeclarationId(1019),
+            name: Some("VariableBindingRule".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "prefix".to_string(),
-                        ty: DeclarationId(230),
+                        label: "EmitLetBindingAlways".to_string(),
+                        ty: DeclarationId(1923),
                     },
                     Field {
-                        label: "separator".to_string(),
-                        ty: DeclarationId(230),
+                        label: "EmitLetUnderscoreWhenUnused".to_string(),
+                        ty: DeclarationId(1924),
+                    },
+                    Field {
+                        label: "OmitLetBinding".to_string(),
+                        ty: DeclarationId(1925),
                     },
                 ],
             },
@@ -34564,24 +33305,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/emit_model.dag", 12525, 12584),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3995, 4095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1038),
-            name: Some("ControlFlowSyntax".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
+            id: DeclarationId(1020),
+            name: Some("MatchArmBodyRule".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "if_else".to_string(),
-                        ty: DeclarationId(230),
+                        label: "WrapBody".to_string(),
+                        ty: DeclarationId(1926),
                     },
                     Field {
-                        label: "match_arm".to_string(),
-                        ty: DeclarationId(230),
+                        label: "NoWrappingOnNonComplexBody".to_string(),
+                        ty: DeclarationId(1927),
                     },
                     Field {
-                        label: "for_each_syntax".to_string(),
-                        ty: DeclarationId(1037),
+                        label: "NotApplicableMatchArmBody".to_string(),
+                        ty: DeclarationId(1928),
                     },
                 ],
             },
@@ -34593,25 +33334,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 12586, 12683),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 4328, 4423),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1039),
-            name: Some("LiteralSyntax".to_string()),
+            id: DeclarationId(1021),
+            name: Some("CorrectionStyle".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "true_keyword".to_string(),
+                        label: "indent_unit".to_string(),
                         ty: DeclarationId(230),
                     },
                     Field {
-                        label: "false_keyword".to_string(),
+                        label: "line_ending".to_string(),
                         ty: DeclarationId(230),
                     },
                     Field {
-                        label: "string_delimiter".to_string(),
+                        label: "string_quote".to_string(),
                         ty: DeclarationId(230),
                     },
+                    Field {
+                        label: "trailing_semicolon".to_string(),
+                        ty: DeclarationId(128),
+                    },
                 ],
             },
             type_params: vec![],
@@ -34622,16 +33367,34 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 12685, 12781),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 4736, 4854),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1040),
-            name: Some("ModuleSyntax".to_string()),
+            id: DeclarationId(1022),
+            name: Some("PostEmitVerifier".to_string()),
             connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "path_separator".to_string(),
-                    ty: DeclarationId(230),
-                }],
+                children: vec![
+                    Field {
+                        label: "command".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "args".to_string(),
+                        ty: DeclarationId(1929),
+                    },
+                    Field {
+                        label: "syntax_only".to_string(),
+                        ty: DeclarationId(128),
+                    },
+                    Field {
+                        label: "expected_exit_code".to_string(),
+                        ty: DeclarationId(93),
+                    },
+                    Field {
+                        label: "output_policy".to_string(),
+                        ty: DeclarationId(1023),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -34641,32 +33404,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/emit_model.dag", 12783, 12829),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 5270, 5418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1041),
-            name: Some("FunctionSyntax".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "definition".to_string(),
-                        ty: DeclarationId(230),
-                    },
+            id: DeclarationId(1023),
+            name: Some("VerifierOutputPolicy".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "definition_exported".to_string(),
-                        ty: DeclarationId(230),
+                        label: "IgnoreVerifierOutput".to_string(),
+                        ty: DeclarationId(1930),
                     },
                     Field {
-                        label: "definition_void".to_string(),
-                        ty: DeclarationId(230),
+                        label: "RequireEmptyStdout".to_string(),
+                        ty: DeclarationId(1931),
                     },
                     Field {
-                        label: "param_with_type".to_string(),
-                        ty: DeclarationId(230),
+                        label: "RequireEmptyStderr".to_string(),
+                        ty: DeclarationId(1932),
                     },
                     Field {
-                        label: "param_separator".to_string(),
-                        ty: DeclarationId(230),
+                        label: "RequireEmptyStdoutAndStderr".to_string(),
+                        ty: DeclarationId(1933),
                     },
                 ],
             },
@@ -34678,16 +33437,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/emit_model.dag", 12831, 12983),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 5663, 5791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1042),
-            name: Some("TypeApplicationSyntax".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "optional".to_string(),
-                    ty: DeclarationId(230),
-                }],
+            id: DeclarationId(1024),
+            name: Some("ShapeATarget".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1008),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -34697,106 +33454,99 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 12985, 13034),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 2839, 2871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1043),
-            name: Some("TypeDefinitionSyntax".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "struct_def".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "struct_field".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "enum_def".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "enum_unit_variant".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "enum_data_variant".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                ],
+            id: DeclarationId(1025),
+            name: Some("rust_shape_a_target".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1024),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Unparsed(SourceSpan::new(
+                "src/v3/std/cross_target_coverage.dag",
+                2914,
+                2927,
+            ))),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 13248, 13396),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 2873, 2927),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1044),
-            name: Some("RecordDeriveTemplateBundle".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "struct_def_no_debug".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "enum_def_no_debug".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                ],
+            id: DeclarationId(1026),
+            name: Some("python_shape_a_target".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1024),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1024)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Unparsed(SourceSpan::new(
+                "src/v3/std/cross_target_coverage.dag",
+                2971,
+                2986,
+            ))),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 14057, 14150),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 2928, 2986),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1045),
-            name: Some("PatternMatchSyntax".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "match_expr".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "match_arm".to_string(),
-                        ty: DeclarationId(230),
-                    },
+            id: DeclarationId(1027),
+            name: Some("go_shape_a_target".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1024),
+                arguments: vec![],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(1024)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::Unparsed(SourceSpan::new(
+                "src/v3/std/cross_target_coverage.dag",
+                3026,
+                3037,
+            ))),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 2987, 3037),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1028),
+            name: Some("FormAxis".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "variant_pattern".to_string(),
-                        ty: DeclarationId(230),
+                        label: "Atom".to_string(),
+                        ty: DeclarationId(1934),
                     },
                     Field {
-                        label: "variant_pattern_positional".to_string(),
-                        ty: DeclarationId(230),
+                        label: "Conj".to_string(),
+                        ty: DeclarationId(1935),
                     },
                     Field {
-                        label: "variant_pattern_empty".to_string(),
-                        ty: DeclarationId(230),
+                        label: "Disj".to_string(),
+                        ty: DeclarationId(1936),
                     },
                     Field {
-                        label: "field_binding".to_string(),
-                        ty: DeclarationId(230),
+                        label: "Arrow".to_string(),
+                        ty: DeclarationId(1937),
                     },
                     Field {
-                        label: "field_binding_separator".to_string(),
-                        ty: DeclarationId(230),
+                        label: "Cardinality".to_string(),
+                        ty: DeclarationId(1938),
                     },
                     Field {
-                        label: "wildcard".to_string(),
-                        ty: DeclarationId(230),
+                        label: "Instantiation".to_string(),
+                        ty: DeclarationId(1939),
                     },
                 ],
             },
@@ -34808,68 +33558,32 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 14854, 15094),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3837, 3909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1046),
-            name: Some("CollectionOps".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "concat_contract".to_string(),
-                        ty: DeclarationId(1300),
-                    },
-                    Field {
-                        label: "length_contract".to_string(),
-                        ty: DeclarationId(1300),
-                    },
-                    Field {
-                        label: "is_empty_contract".to_string(),
-                        ty: DeclarationId(1300),
-                    },
-                    Field {
-                        label: "fold_contract".to_string(),
-                        ty: DeclarationId(1300),
-                    },
-                    Field {
-                        label: "filter_contract".to_string(),
-                        ty: DeclarationId(1300),
-                    },
-                    Field {
-                        label: "flat_map_contract".to_string(),
-                        ty: DeclarationId(1300),
-                    },
-                    Field {
-                        label: "any_contract".to_string(),
-                        ty: DeclarationId(1300),
-                    },
-                    Field {
-                        label: "all_contract".to_string(),
-                        ty: DeclarationId(1300),
-                    },
-                    Field {
-                        label: "map_contract".to_string(),
-                        ty: DeclarationId(1300),
-                    },
+            id: DeclarationId(1029),
+            name: Some("BehaviorAxis".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "filter".to_string(),
-                        ty: DeclarationId(230),
+                        label: "Value".to_string(),
+                        ty: DeclarationId(1940),
                     },
                     Field {
-                        label: "contains".to_string(),
-                        ty: DeclarationId(230),
+                        label: "Transform".to_string(),
+                        ty: DeclarationId(1941),
                     },
                     Field {
-                        label: "empty_list".to_string(),
-                        ty: DeclarationId(230),
+                        label: "Branch".to_string(),
+                        ty: DeclarationId(1942),
                     },
                     Field {
-                        label: "list_literal".to_string(),
-                        ty: DeclarationId(230),
+                        label: "Loop".to_string(),
+                        ty: DeclarationId(1943),
                     },
                     Field {
-                        label: "cons".to_string(),
-                        ty: DeclarationId(230),
+                        label: "Bind".to_string(),
+                        ty: DeclarationId(1944),
                     },
                 ],
             },
@@ -34881,32 +33595,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/emit_model.dag", 15096, 16332),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4469, 4529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1047),
-            name: Some("ValueConstructionSyntax".to_string()),
+            id: DeclarationId(1030),
+            name: Some("MethodTemplateContractKey".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "struct_literal".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "struct_field_init".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "struct_field_separator".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "variant_construction".to_string(),
-                        ty: DeclarationId(230),
+                        label: "target".to_string(),
+                        ty: DeclarationId(1024),
                     },
                     Field {
-                        label: "variant_named_construction".to_string(),
-                        ty: DeclarationId(230),
+                        label: "dag_method".to_string(),
+                        ty: DeclarationId(841),
                     },
                 ],
             },
@@ -34918,20 +33620,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/emit_model.dag", 16334, 16520),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4913, 4994),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1048),
-            name: Some("RenderingModel".to_string()),
+            id: DeclarationId(1031),
+            name: Some("EmissionCell".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "read".to_string(),
-                        ty: DeclarationId(1049),
+                        label: "connective".to_string(),
+                        ty: DeclarationId(1028),
                     },
                     Field {
-                        label: "construct".to_string(),
-                        ty: DeclarationId(1050),
+                        label: "behavior".to_string(),
+                        ty: DeclarationId(1029),
                     },
                 ],
             },
@@ -34943,20 +33645,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/emit_model.dag", 16522, 16597),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5427, 5496),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1049),
-            name: Some("ReadStrategy".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
+            id: DeclarationId(1032),
+            name: Some("EmissionPathProjection".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
                     Field {
-                        label: "Borrow".to_string(),
-                        ty: DeclarationId(1969),
+                        label: "row_identity".to_string(),
+                        ty: DeclarationId(1030),
                     },
                     Field {
-                        label: "PassByValue".to_string(),
-                        ty: DeclarationId(1970),
+                        label: "cells".to_string(),
+                        ty: DeclarationId(1945),
                     },
                 ],
             },
@@ -34968,85 +33670,1590 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 17095, 17139),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5842, 5943),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1033),
+            name: Some("emission_path_projections".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1032),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(1946)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::List(vec![
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1025)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(258)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1025)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(271)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1025)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(295)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1025)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(273)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1025)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(264)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1025)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(262)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1025)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(252)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1025)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(263)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1025)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(249)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1025)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(248)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1025)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(265)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1025)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(293)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1025)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(299)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(258)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(271)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(295)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(273)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(264)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(262)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(252)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(263)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(249)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(248)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(265)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(293)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(299)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(294)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(250)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1026)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(297)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1027)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(258)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1027)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(271)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1027)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(295)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1027)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(263)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1027)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(249)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1027)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(248)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1027)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(265)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1027)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(293)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1027)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(299)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1027)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(294)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1027)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(250)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "row_identity".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "target".to_string(),
+                                FieldValue::Reference(DeclarationId(1027)),
+                            ),
+                            (
+                                "dag_method".to_string(),
+                                FieldValue::Record(vec![(
+                                    "decl".to_string(),
+                                    FieldValue::Reference(DeclarationId(297)),
+                                )]),
+                            ),
+                        ]),
+                    ),
+                    (
+                        "cells".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "connective".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1938),
+                                    payload: vec![],
+                                },
+                            ),
+                            (
+                                "behavior".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(1941),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                ]),
+            ])),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6364, 12528),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1050),
-            name: Some("ConstructStrategy".to_string()),
+            id: DeclarationId(1034),
+            name: Some("CompilerDiagnosticKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "CopyOrClone".to_string(),
-                        ty: DeclarationId(1971),
-                    },
-                    Field {
-                        label: "PassByValue".to_string(),
-                        ty: DeclarationId(1972),
-                    },
-                ],
-            },
-            type_params: vec![],
-            phantom_params: 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", 17432, 17486),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1051),
-            name: Some("LanguageSpec".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "statements".to_string(),
-                        ty: DeclarationId(1300),
-                    },
-                    Field {
-                        label: "expressions".to_string(),
-                        ty: DeclarationId(1300),
-                    },
-                    Field {
-                        label: "control_flow".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "TokenizerError".to_string(),
+                        ty: DeclarationId(1947),
                     },
                     Field {
-                        label: "literals".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "ParseError".to_string(),
+                        ty: DeclarationId(1948),
                     },
                     Field {
-                        label: "modules".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "TypeMismatch".to_string(),
+                        ty: DeclarationId(1949),
                     },
                     Field {
-                        label: "functions".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "ArityMismatch".to_string(),
+                        ty: DeclarationId(1950),
                     },
                     Field {
-                        label: "type_applications".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "ResolveError".to_string(),
+                        ty: DeclarationId(1951),
                     },
                     Field {
-                        label: "type_definitions".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "UnitMismatch".to_string(),
+                        ty: DeclarationId(1952),
                     },
                     Field {
-                        label: "record_derive_templates".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "BranchConditionNotBool".to_string(),
+                        ty: DeclarationId(1953),
                     },
                     Field {
-                        label: "patterns".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "MagnitudeOutOfRange".to_string(),
+                        ty: DeclarationId(1954),
                     },
                     Field {
-                        label: "collection_ops".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "MalformedIntegerRangeFact".to_string(),
+                        ty: DeclarationId(1955),
                     },
                     Field {
-                        label: "values".to_string(),
-                        ty: DeclarationId(1300),
+                        label: "NominalOpacityViolation".to_string(),
+                        ty: DeclarationId(1956),
                     },
                 ],
             },
@@ -35058,20 +35265,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/emit_model.dag", 17488, 18014),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1067, 1306),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1052),
-            name: Some("PlaceholderConvention".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
+            id: DeclarationId(1035),
+            name: Some("Correction".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
                     Field {
-                        label: "IndexedArgs".to_string(),
-                        ty: DeclarationId(1973),
+                        label: "description".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "NamedArg".to_string(),
-                        ty: DeclarationId(1974),
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                    Field {
+                        label: "new_source".to_string(),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -35083,20 +35294,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/emit_model.dag", 19388, 19443),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1512, 1765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1053),
-            name: Some("MethodEmitTemplate".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
+            id: DeclarationId(1036),
+            name: Some("DiagnosticKindDecl".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
                     Field {
-                        label: "SingleTemplate".to_string(),
-                        ty: DeclarationId(1975),
+                        label: "name".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "HigherOrderTemplates".to_string(),
-                        ty: DeclarationId(1976),
+                        label: "payload".to_string(),
+                        ty: DeclarationId(778),
                     },
                 ],
             },
@@ -35108,34 +35319,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/emit_model.dag", 20578, 20734),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 2545, 2608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1054),
-            name: Some("MethodTemplateContract".to_string()),
+            id: DeclarationId(1037),
+            name: Some("LensInstanceKindWitness".to_string()),
             connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "dag_method".to_string(),
-                        ty: DeclarationId(841),
-                    },
-                    Field {
-                        label: "runtime_template".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "emit_template".to_string(),
-                        ty: DeclarationId(1053),
-                    },
-                    Field {
-                        label: "wraps_result".to_string(),
-                        ty: DeclarationId(128),
-                    },
-                    Field {
-                        label: "placeholder_convention".to_string(),
-                        ty: DeclarationId(1052),
-                    },
-                ],
+                children: vec![Field {
+                    label: "kind_decl".to_string(),
+                    ty: DeclarationId(1314),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -35145,16 +35338,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 22527, 22714),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 4810, 4870),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1055),
-            name: Some("BootstrapFixture".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "virtual_path".to_string(),
-                    ty: DeclarationId(230),
-                }],
+            id: DeclarationId(1038),
+            name: Some("AnyDiagnosticKind".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "CompilerKind".to_string(),
+                        ty: DeclarationId(1957),
+                    },
+                    Field {
+                        label: "LensInstanceKind".to_string(),
+                        ty: DeclarationId(1958),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -35164,52 +35363,73 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1395, 1443),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5479, 5588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1056),
-            name: Some("BootstrapFixtureSet".to_string()),
+            id: DeclarationId(1039),
+            name: Some("Diagnostic".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "rust_pilot_primitives".to_string(),
-                        ty: DeclarationId(1055),
+                        label: "kind".to_string(),
+                        ty: DeclarationId(1038),
                     },
                     Field {
-                        label: "rust_method_template_contracts".to_string(),
-                        ty: DeclarationId(1055),
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
                     },
                     Field {
-                        label: "python_method_template_contracts".to_string(),
-                        ty: DeclarationId(1055),
+                        label: "message".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "go_method_template_contracts".to_string(),
-                        ty: DeclarationId(1055),
+                        label: "fixes".to_string(),
+                        ty: DeclarationId(1959),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5957, 6065),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1040),
+            name: Some("EmissionDiagnostic".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "UnderRefined".to_string(),
+                        ty: DeclarationId(1960),
                     },
                     Field {
-                        label: "anthropic_operations".to_string(),
-                        ty: DeclarationId(1055),
+                        label: "NoInhabitant".to_string(),
+                        ty: DeclarationId(1961),
                     },
                     Field {
-                        label: "cross_target_coverage".to_string(),
-                        ty: DeclarationId(1055),
+                        label: "ContradictoryUse".to_string(),
+                        ty: DeclarationId(1963),
                     },
                     Field {
-                        label: "extdeps_cron".to_string(),
-                        ty: DeclarationId(1055),
+                        label: "OutOfR2Scope".to_string(),
+                        ty: DeclarationId(1964),
                     },
                     Field {
-                        label: "extdeps_github_github".to_string(),
-                        ty: DeclarationId(1055),
+                        label: "LifetimeProgramExtractionPending".to_string(),
+                        ty: DeclarationId(1965),
                     },
                     Field {
-                        label: "extdeps_github_actions".to_string(),
-                        ty: DeclarationId(1055),
+                        label: "FoldNotImplemented".to_string(),
+                        ty: DeclarationId(1966),
                     },
                     Field {
-                        label: "extdeps_github_ci".to_string(),
-                        ty: DeclarationId(1055),
+                        label: "MissingEmissionPath".to_string(),
+                        ty: DeclarationId(1967),
                     },
                 ],
             },
@@ -35221,917 +35441,198 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1600, 2062),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1057),
-            name: Some("bootstrap_fixture_authority".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1056),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1056)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "rust_pilot_primitives".to_string(),
-                        FieldValue::Record(vec![(
-                            "virtual_path".to_string(),
-                            FieldValue::Literal(LiteralBits::String(
-                                "dsl/extdeps/languages/rust/primitives.dag".to_string(),
-                            )),
-                        )]),
-                    ),
-                    (
-                        "rust_method_template_contracts".to_string(),
-                        FieldValue::Record(vec![(
-                            "virtual_path".to_string(),
-                            FieldValue::Literal(LiteralBits::String(
-                                "src/v3/std/rust_method_template_contracts.dag".to_string(),
-                            )),
-                        )]),
-                    ),
-                    (
-                        "python_method_template_contracts".to_string(),
-                        FieldValue::Record(vec![(
-                            "virtual_path".to_string(),
-                            FieldValue::Literal(LiteralBits::String(
-                                "src/v3/std/python_method_template_contracts.dag".to_string(),
-                            )),
-                        )]),
-                    ),
-                    (
-                        "go_method_template_contracts".to_string(),
-                        FieldValue::Record(vec![(
-                            "virtual_path".to_string(),
-                            FieldValue::Literal(LiteralBits::String(
-                                "src/v3/std/go_method_template_contracts.dag".to_string(),
-                            )),
-                        )]),
-                    ),
-                    (
-                        "anthropic_operations".to_string(),
-                        FieldValue::Record(vec![(
-                            "virtual_path".to_string(),
-                            FieldValue::Literal(LiteralBits::String(
-                                "src/v3/std/anthropic_operations.dag".to_string(),
-                            )),
-                        )]),
-                    ),
-                    (
-                        "cross_target_coverage".to_string(),
-                        FieldValue::Record(vec![(
-                            "virtual_path".to_string(),
-                            FieldValue::Literal(LiteralBits::String(
-                                "src/v3/std/cross_target_coverage.dag".to_string(),
-                            )),
-                        )]),
-                    ),
-                    (
-                        "extdeps_cron".to_string(),
-                        FieldValue::Record(vec![(
-                            "virtual_path".to_string(),
-                            FieldValue::Literal(LiteralBits::String(
-                                "dsl/extdeps/cron_schedule_model.dag".to_string(),
-                            )),
-                        )]),
-                    ),
-                    (
-                        "extdeps_github_github".to_string(),
-                        FieldValue::Record(vec![(
-                            "virtual_path".to_string(),
-                            FieldValue::Literal(LiteralBits::String(
-                                "dsl/extdeps/github/github.dag".to_string(),
-                            )),
-                        )]),
-                    ),
-                    (
-                        "extdeps_github_actions".to_string(),
-                        FieldValue::Record(vec![(
-                            "virtual_path".to_string(),
-                            FieldValue::Literal(LiteralBits::String(
-                                "dsl/extdeps/github/actions.dag".to_string(),
-                            )),
-                        )]),
-                    ),
-                    (
-                        "extdeps_github_ci".to_string(),
-                        FieldValue::Record(vec![(
-                            "virtual_path".to_string(),
-                            FieldValue::Literal(LiteralBits::String(
-                                "dsl/extdeps/github/ci.dag".to_string(),
-                            )),
-                        )]),
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 2064, 3032),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1058),
-            name: Some("go_language_spec_free_monoid_concat_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(256)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String(
-                            "append({left}, {right}...)".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "append({left}, {right}...)".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/go_method_template_contracts.dag", 3213, 3515),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 8699, 11469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1059),
-            name: Some("go_language_spec_free_monoid_length_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(274)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String("int64(len({recv}))".to_string())),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "int64(len({recv}))".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1974),
-                            payload: vec![],
-                        },
-                    ),
+            id: DeclarationId(1041),
+            name: Some("Witness".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "Inhabits".to_string(),
+                        ty: DeclarationId(1982),
+                    },
+                    Field {
+                        label: "Violates".to_string(),
+                        ty: DeclarationId(1983),
+                    },
                 ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 3517, 3803),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1060),
-            name: Some("go_language_spec_free_monoid_emptiness_contract".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
-                arguments: vec![],
             },
-            type_params: vec![],
+            type_params: vec![DeclarationId(1042)],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: None,
             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(270)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String("len({recv}) == 0".to_string())),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "len({recv}) == 0".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1974),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 3895, 4182),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 1608, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1061),
-            name: Some("go_language_spec_free_monoid_fold_contract".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
-                arguments: vec![],
-            },
+            id: DeclarationId(1042),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: None,
             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(266)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String(
-                            "/* fold({recv}, {init}, {body}) */".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "/* fold({recv}, {init}, {body}) */".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1974),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 4617, 4931),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 1608, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1062),
-            name: Some("go_language_spec_map_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(277)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String(
-                            "/* map({recv}, {body}) */".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "/* map({recv}, {body}) */".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1974),
-                            payload: vec![],
-                        },
-                    ),
+            id: DeclarationId(1043),
+            name: Some("OptionalDiagnostic".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "NoDiagnostic".to_string(),
+                        ty: DeclarationId(1984),
+                    },
+                    Field {
+                        label: "SomeDiagnostic".to_string(),
+                        ty: DeclarationId(1985),
+                    },
                 ],
-            }),
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 5417, 5699),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 1851, 1932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1063),
-            name: Some("go_filter_method_template_contract".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
-                arguments: vec![],
+            id: DeclarationId(1044),
+            name: Some("DimensionReport".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "DimensionOk".to_string(),
+                        ty: DeclarationId(1988),
+                    },
+                    Field {
+                        label: "DimensionFail".to_string(),
+                        ty: DeclarationId(1992),
+                    },
+                ],
             },
-            type_params: vec![],
+            type_params: vec![DeclarationId(1045)],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: None,
             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(
-                            "v2rt.Filter({recv}, {arg})".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "v2rt.Filter({recv}, {arg})".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1974),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 5701, 5993),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 2291, 2567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1064),
-            name: Some("go_any_method_template_contract".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
-                arguments: vec![],
-            },
+            id: DeclarationId(1045),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: None,
             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(
-                            "v2rt.Any({recv}, {arg})".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "v2rt.Any({recv}, {arg})".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1974),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 5995, 6275),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 2291, 2567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1065),
-            name: Some("go_all_method_template_contract".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
-                arguments: vec![],
+            id: DeclarationId(1046),
+            name: Some("AnalysisDimension".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "name".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "witness_of".to_string(),
+                        ty: DeclarationId(1994),
+                    },
+                    Field {
+                        label: "compose".to_string(),
+                        ty: DeclarationId(1995),
+                    },
+                    Field {
+                        label: "break_diagnostic".to_string(),
+                        ty: DeclarationId(1996),
+                    },
+                ],
             },
-            type_params: vec![],
+            type_params: vec![DeclarationId(1047)],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: None,
             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(
-                            "v2rt.All({recv}, {arg})".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "v2rt.All({recv}, {arg})".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1974),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6277, 6557),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 3818, 4011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1066),
-            name: Some("go_flat_map_method_template_contract".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
-                arguments: vec![],
-            },
+            id: DeclarationId(1047),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: None,
             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(
-                            "v2rt.FlatMap({recv}, {arg})".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "v2rt.FlatMap({recv}, {arg})".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1974),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6559, 6857),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 3818, 4011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1067),
-            name: Some("go_method_template_contracts".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1054),
+            id: DeclarationId(1048),
+            name: Some("Dimension".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "value".to_string(),
+                    ty: DeclarationId(1050),
                 }],
             },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1977)),
+            type_params: vec![DeclarationId(1049), DeclarationId(1050)],
+            phantom_params: vec![PhantomParameter {
+                parameter: DeclarationId(1049),
+                algebra: DeclarationId(1997),
+            }],
+            meta_tag: None,
             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("len({recv})".to_string())),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "len({recv})".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(
-                            "strings.Join({recv}, {arg})".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "strings.Join({recv}, {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(
-                            "strings.Split({recv}, {arg})".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "strings.Split({recv}, {arg})".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1974),
-                            payload: vec![],
-                        },
-                    ),
-                ]),
-                FieldValue::Reference(DeclarationId(1063)),
-                FieldValue::Reference(DeclarationId(1064)),
-                FieldValue::Reference(DeclarationId(1065)),
-                FieldValue::Reference(DeclarationId(1066)),
-                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}[{arg}:]".to_string())),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "{recv}[{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(299)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String("{recv}[:{arg}]".to_string())),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "{recv}[:{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(294)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String(
-                            "v2rt.SortBy({recv}, {arg})".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "v2rt.SortBy({recv}, {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(250)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String(
-                            "append({recv}, {arg})".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "append({recv}, {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(297)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String(
-                            "strings.Contains({recv}, {arg})".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "strings.Contains({recv}, {arg})".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1974),
-                            payload: vec![],
-                        },
-                    ),
-                ]),
-            ])),
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1049),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6859, 8941),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1068),
-            name: Some("RecursionShape".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "DirectRecursion".to_string(),
-                        ty: DeclarationId(1991),
-                    },
-                    Field {
-                        label: "ListRecursion".to_string(),
-                        ty: DeclarationId(1992),
-                    },
-                    Field {
-                        label: "OptionalRecursion".to_string(),
-                        ty: DeclarationId(1993),
-                    },
-                    Field {
-                        label: "SetRecursion".to_string(),
-                        ty: DeclarationId(1994),
-                    },
-                    Field {
-                        label: "MapValueRecursion".to_string(),
-                        ty: DeclarationId(1995),
-                    },
-                ],
-            },
+            id: DeclarationId(1050),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36140,35 +35641,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/induction.dag", 5605, 5878),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1069),
-            name: Some("InductiveField".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "type_name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "variant_name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "field_name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "shape".to_string(),
-                        ty: DeclarationId(1068),
-                    },
-                    Field {
-                        label: "element_type".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                ],
-            },
+            id: DeclarationId(1051),
+            name: Some("Meters".to_string()),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36177,16 +35655,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/induction.dag", 7170, 7592),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4704, 4715),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1070),
-            name: Some("recursion_shape_eq".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1068), DeclarationId(1068)],
-                output: DeclarationId(128),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 7662, 8034)),
-            },
+            id: DeclarationId(1052),
+            name: Some("Seconds".to_string()),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36195,16 +35669,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/induction.dag", 7594, 8034),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4716, 4728),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1071),
-            name: Some("inductive_field_eq".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1069), DeclarationId(1069)],
-                output: DeclarationId(128),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8104, 8302)),
-            },
+            id: DeclarationId(1053),
+            name: Some("Kilograms".to_string()),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36213,16 +35683,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/induction.dag", 8036, 8302),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4729, 4743),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1072),
-            name: Some("inductive_field_to_dimension".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1069), DeclarationId(230)],
-                output: DeclarationId(1204),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8768, 8799)),
-            },
+            id: DeclarationId(1054),
+            name: Some("Amperes".to_string()),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36231,35 +35697,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/induction.dag", 8678, 8799),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4744, 4756),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1073),
-            name: Some("SubValueRelation".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "StrictSubValue".to_string(),
-                        ty: DeclarationId(1996),
-                    },
-                    Field {
-                        label: "IteratedSubValue".to_string(),
-                        ty: DeclarationId(1997),
-                    },
-                    Field {
-                        label: "ArithmeticDescent".to_string(),
-                        ty: DeclarationId(1998),
-                    },
-                    Field {
-                        label: "PreservedValue".to_string(),
-                        ty: DeclarationId(1999),
-                    },
-                    Field {
-                        label: "SubValueUnknown".to_string(),
-                        ty: DeclarationId(2000),
-                    },
-                ],
-            },
+            id: DeclarationId(1055),
+            name: Some("Kelvin".to_string()),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36268,20 +35711,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/induction.dag", 9945, 10181),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4757, 4768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1074),
-            name: Some("sub_value_to_evidence".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1073)],
-                output: DeclarationId(1197),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    11134,
-                    11737,
-                )),
-            },
+            id: DeclarationId(1056),
+            name: Some("Moles".to_string()),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36290,20 +35725,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/induction.dag", 11062, 11737),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4769, 4779),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1075),
-            name: Some("shrink_factor_eq".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(938), DeclarationId(938)],
-                output: DeclarationId(128),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    12205,
-                    12691,
-                )),
-            },
+            id: DeclarationId(1057),
+            name: Some("Candela".to_string()),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36312,21 +35739,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/induction.dag", 12143, 12691),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4780, 4792),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1076),
-            name: Some("meet_sub_value".to_string()),
+            id: DeclarationId(1058),
+            name: Some("add_dimension".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1073), DeclarationId(1073)],
-                output: DeclarationId(1073),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    13282,
-                    14694,
-                )),
+                inputs: vec![
+                    DeclarationId(1968),
+                    DeclarationId(1969),
+                    DeclarationId(1970),
+                ],
+                output: DeclarationId(1971),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4966, 4988)),
             },
-            type_params: vec![],
+            type_params: vec![DeclarationId(1059), DeclarationId(1060)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -36334,20 +35761,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/induction.dag", 13202, 14694),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4794, 4988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1077),
-            name: Some("join_sub_value".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1073), DeclarationId(1073)],
-                output: DeclarationId(1073),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    15026,
-                    16329,
-                )),
-            },
+            id: DeclarationId(1059),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36356,20 +35775,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/induction.dag", 14946, 16329),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4794, 4988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1078),
-            name: Some("compose_sub_value".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1073), DeclarationId(1069)],
-                output: DeclarationId(1073),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    17472,
-                    17594,
-                )),
-            },
+            id: DeclarationId(1060),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36378,21 +35789,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/induction.dag", 17384, 17594),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4794, 4988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1079),
-            name: Some("compose_sub_value_relations".to_string()),
+            id: DeclarationId(1061),
+            name: Some("sub_dimension".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1073), DeclarationId(1073)],
-                output: DeclarationId(1073),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    18450,
-                    19796,
-                )),
+                inputs: vec![
+                    DeclarationId(1972),
+                    DeclarationId(1973),
+                    DeclarationId(1974),
+                ],
+                output: DeclarationId(1975),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5162, 5184)),
             },
-            type_params: vec![],
+            type_params: vec![DeclarationId(1062), DeclarationId(1063)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -36400,20 +35811,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/induction.dag", 18342, 19796),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4990, 5184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1080),
-            name: Some("sub_value_to_call_pattern".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1073)],
-                output: DeclarationId(1978),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    20571,
-                    21367,
-                )),
-            },
+            id: DeclarationId(1062),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36422,20 +35825,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/induction.dag", 20498, 21367),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4990, 5184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1081),
-            name: Some("sub_value_to_lowering_target".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1073)],
-                output: DeclarationId(1979),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    21959,
-                    22864,
-                )),
-            },
+            id: DeclarationId(1063),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36444,32 +35839,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/induction.dag", 21880, 22864),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4990, 5184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1082),
-            name: Some("PolynomialExponent".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "IntegerExpZero".to_string(),
-                        ty: DeclarationId(2001),
-                    },
-                    Field {
-                        label: "IntegerExpPos".to_string(),
-                        ty: DeclarationId(2002),
-                    },
-                    Field {
-                        label: "FractionExp".to_string(),
-                        ty: DeclarationId(2003),
-                    },
-                    Field {
-                        label: "LogBasedExp".to_string(),
-                        ty: DeclarationId(2004),
-                    },
+            id: DeclarationId(1064),
+            name: Some("mul_dimension_scalar".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![
+                    DeclarationId(1976),
+                    DeclarationId(1977),
+                    DeclarationId(1066),
                 ],
+                output: DeclarationId(1978),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5350, 5379)),
             },
-            type_params: vec![],
+            type_params: vec![DeclarationId(1065), DeclarationId(1066)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -36477,20 +35861,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/induction.dag", 24107, 24362),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5186, 5379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1083),
-            name: Some("poly_exp_degree_one".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1082),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    24411,
-                    24450,
-                )),
-            },
+            id: DeclarationId(1065),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36499,23 +35875,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/induction.dag", 24364, 24450),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5186, 5379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1084),
-            name: Some("AtomicCost".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "PolyCost".to_string(),
-                        ty: DeclarationId(2005),
-                    },
-                    Field {
-                        label: "LogCost".to_string(),
-                        ty: DeclarationId(2006),
-                    },
-                ],
-            },
+            id: DeclarationId(1066),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36524,44 +35889,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/induction.dag", 24962, 25079),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5186, 5379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1085),
-            name: Some("CostBound".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "ConstantBound".to_string(),
-                        ty: DeclarationId(2007),
-                    },
-                    Field {
-                        label: "AtomicBound".to_string(),
-                        ty: DeclarationId(2008),
-                    },
-                    Field {
-                        label: "ProductBound".to_string(),
-                        ty: DeclarationId(2010),
-                    },
-                    Field {
-                        label: "SumOfProductsBound".to_string(),
-                        ty: DeclarationId(2013),
-                    },
-                    Field {
-                        label: "SumBound".to_string(),
-                        ty: DeclarationId(2015),
-                    },
-                    Field {
-                        label: "ForeverBound".to_string(),
-                        ty: DeclarationId(2016),
-                    },
-                    Field {
-                        label: "ErrorBound".to_string(),
-                        ty: DeclarationId(2017),
-                    },
+            id: DeclarationId(1067),
+            name: Some("div_dimension_scalar".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![
+                    DeclarationId(1979),
+                    DeclarationId(1980),
+                    DeclarationId(1069),
                 ],
+                output: DeclarationId(1981),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5545, 5574)),
             },
-            type_params: vec![],
+            type_params: vec![DeclarationId(1068), DeclarationId(1069)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -36569,20 +35911,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/induction.dag", 26709, 27469),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5381, 5574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1086),
-            name: Some("sum_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1980)],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    27880,
-                    27986,
-                )),
-            },
+            id: DeclarationId(1068),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36591,20 +35925,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/induction.dag", 27830, 27986),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5381, 5574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1087),
-            name: Some("cost_bound_is_sum_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1085)],
-                output: DeclarationId(128),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    28310,
-                    28563,
-                )),
-            },
+            id: DeclarationId(1069),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36613,229 +35939,812 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 28261, 28563),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5381, 5574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1088),
-            name: Some("cost_bound_to_symbolic".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1085)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(544))),
+            id: DeclarationId(1070),
+            name: Some("go_language_spec_free_monoid_concat_contract".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1011),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "dag_method".to_string(),
+                        FieldValue::Record(vec![(
+                            "decl".to_string(),
+                            FieldValue::Reference(DeclarationId(256)),
+                        )]),
+                    ),
+                    (
+                        "runtime_template".to_string(),
+                        FieldValue::Literal(LiteralBits::String(
+                            "append({left}, {right}...)".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "append({left}, {right}...)".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 29000, 29517),
+            span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 3213, 3515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1089),
-            name: Some("atomic_cost_to_symbolic".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1084)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(553))),
+            id: DeclarationId(1071),
+            name: Some("go_language_spec_free_monoid_length_contract".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1011),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "dag_method".to_string(),
+                        FieldValue::Record(vec![(
+                            "decl".to_string(),
+                            FieldValue::Reference(DeclarationId(274)),
+                        )]),
+                    ),
+                    (
+                        "runtime_template".to_string(),
+                        FieldValue::Literal(LiteralBits::String("int64(len({recv}))".to_string())),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "int64(len({recv}))".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 29519, 29839),
+            span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 3517, 3803),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1090),
-            name: Some("product_atoms_to_symbolic".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1981)],
-                output: DeclarationId(849),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    29913,
-                    29949,
-                )),
+            id: DeclarationId(1072),
+            name: Some("go_language_spec_free_monoid_emptiness_contract".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1011),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "dag_method".to_string(),
+                        FieldValue::Record(vec![(
+                            "decl".to_string(),
+                            FieldValue::Reference(DeclarationId(270)),
+                        )]),
+                    ),
+                    (
+                        "runtime_template".to_string(),
+                        FieldValue::Literal(LiteralBits::String("len({recv}) == 0".to_string())),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "len({recv}) == 0".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 29841, 29949),
+            span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 3895, 4182),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1091),
-            name: Some("product_term_to_symbolic".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1982)],
-                output: DeclarationId(849),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(555))),
+            id: DeclarationId(1073),
+            name: Some("go_language_spec_free_monoid_fold_contract".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1011),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "dag_method".to_string(),
+                        FieldValue::Record(vec![(
+                            "decl".to_string(),
+                            FieldValue::Reference(DeclarationId(266)),
+                        )]),
+                    ),
+                    (
+                        "runtime_template".to_string(),
+                        FieldValue::Literal(LiteralBits::String(
+                            "/* fold({recv}, {init}, {body}) */".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "/* fold({recv}, {init}, {body}) */".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 29951, 30060),
+            span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 4617, 4931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1092),
-            name: Some("sum_products_to_symbolic".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1984)],
-                output: DeclarationId(849),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    30137,
-                    30172,
-                )),
+            id: DeclarationId(1074),
+            name: Some("go_language_spec_map_contract".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1011),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "dag_method".to_string(),
+                        FieldValue::Record(vec![(
+                            "decl".to_string(),
+                            FieldValue::Reference(DeclarationId(277)),
+                        )]),
+                    ),
+                    (
+                        "runtime_template".to_string(),
+                        FieldValue::Literal(LiteralBits::String(
+                            "/* map({recv}, {body}) */".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "/* map({recv}, {body}) */".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 30062, 30172),
+            span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 5417, 5699),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1093),
-            name: Some("cost_constant".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    30206,
-                    30223,
-                )),
+            id: DeclarationId(1075),
+            name: Some("go_filter_method_template_contract".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1011),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
-            value_body: 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(
+                            "v2rt.Filter({recv}, {arg})".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "v2rt.Filter({recv}, {arg})".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 30174, 30223),
+            span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 5701, 5993),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1094),
-            name: Some("cost_linear".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(230)],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    30267,
-                    30351,
-                )),
+            id: DeclarationId(1076),
+            name: Some("go_any_method_template_contract".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1011),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
-            value_body: 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(
+                            "v2rt.Any({recv}, {arg})".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "v2rt.Any({recv}, {arg})".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 30224, 30351),
+            span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 5995, 6275),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1095),
-            name: Some("cost_poly".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(230), DeclarationId(93)],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    30406,
-                    30805,
-                )),
+            id: DeclarationId(1077),
+            name: Some("go_all_method_template_contract".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1011),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
-            value_body: 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(
+                            "v2rt.All({recv}, {arg})".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "v2rt.All({recv}, {arg})".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 30352, 30805),
+            span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6277, 6557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1096),
-            name: Some("cost_root".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(230), DeclarationId(93)],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    30855,
-                    31129,
-                )),
+            id: DeclarationId(1078),
+            name: Some("go_flat_map_method_template_contract".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1011),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
-            value_body: 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(
+                            "v2rt.FlatMap({recv}, {arg})".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "v2rt.FlatMap({recv}, {arg})".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 30806, 31129),
+            span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6559, 6857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1097),
-            name: Some("cost_sqrt".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(230)],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    31171,
-                    31204,
-                )),
+            id: DeclarationId(1079),
+            name: Some("go_method_template_contracts".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1011),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1998)),
             specialization_parent: None,
             inhabits: None,
-            value_body: 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("len({recv})".to_string())),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "len({recv})".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            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(
+                            "strings.Join({recv}, {arg})".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "strings.Join({recv}, {arg})".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            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(
+                            "strings.Split({recv}, {arg})".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "strings.Split({recv}, {arg})".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ]),
+                FieldValue::Reference(DeclarationId(1075)),
+                FieldValue::Reference(DeclarationId(1076)),
+                FieldValue::Reference(DeclarationId(1077)),
+                FieldValue::Reference(DeclarationId(1078)),
+                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}[{arg}:]".to_string())),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "{recv}[{arg}:]".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            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}[:{arg}]".to_string())),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "{recv}[:{arg}]".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "dag_method".to_string(),
+                        FieldValue::Record(vec![(
+                            "decl".to_string(),
+                            FieldValue::Reference(DeclarationId(294)),
+                        )]),
+                    ),
+                    (
+                        "runtime_template".to_string(),
+                        FieldValue::Literal(LiteralBits::String(
+                            "v2rt.SortBy({recv}, {arg})".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "v2rt.SortBy({recv}, {arg})".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "dag_method".to_string(),
+                        FieldValue::Record(vec![(
+                            "decl".to_string(),
+                            FieldValue::Reference(DeclarationId(250)),
+                        )]),
+                    ),
+                    (
+                        "runtime_template".to_string(),
+                        FieldValue::Literal(LiteralBits::String(
+                            "append({recv}, {arg})".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "append({recv}, {arg})".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "dag_method".to_string(),
+                        FieldValue::Record(vec![(
+                            "decl".to_string(),
+                            FieldValue::Reference(DeclarationId(297)),
+                        )]),
+                    ),
+                    (
+                        "runtime_template".to_string(),
+                        FieldValue::Literal(LiteralBits::String(
+                            "strings.Contains({recv}, {arg})".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "strings.Contains({recv}, {arg})".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ]),
+            ])),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 31130, 31204),
+            span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6859, 8941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1098),
-            name: Some("cost_cbrt".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(230)],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    31246,
-                    31279,
-                )),
+            id: DeclarationId(1080),
+            name: Some("Lens".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "name".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "read".to_string(),
+                        ty: DeclarationId(2000),
+                    },
+                    Field {
+                        label: "sequential".to_string(),
+                        ty: DeclarationId(2001),
+                    },
+                    Field {
+                        label: "branch".to_string(),
+                        ty: DeclarationId(2002),
+                    },
+                    Field {
+                        label: "iterate".to_string(),
+                        ty: DeclarationId(2003),
+                    },
+                    Field {
+                        label: "validate".to_string(),
+                        ty: DeclarationId(2004),
+                    },
+                ],
             },
-            type_params: vec![],
+            type_params: vec![DeclarationId(1081)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -36843,20 +36752,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/induction.dag", 31205, 31279),
+            span: SourceSpan::new("src/v3/std/lens.dag", 4121, 4318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1099),
-            name: Some("cost_log".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(230)],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    31320,
-                    31370,
-                )),
-            },
+            id: DeclarationId(1081),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("C".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -36865,19 +36766,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 31280, 31370),
+            span: SourceSpan::new("src/v3/std/lens.dag", 4121, 4318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1100),
-            name: Some("cost_nlogn".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(230)],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    31414,
-                    31532,
-                )),
+            id: DeclarationId(1082),
+            name: Some("SectionRef".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "DeclarationScope".to_string(),
+                        ty: DeclarationId(2005),
+                    },
+                    Field {
+                        label: "NodeScope".to_string(),
+                        ty: DeclarationId(2006),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -36887,19 +36791,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/induction.dag", 31372, 31532),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 3544, 3677),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1101),
-            name: Some("cost_graph_linear".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(230), DeclarationId(230)],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    31602,
-                    31778,
-                )),
+            id: DeclarationId(1083),
+            name: Some("DiagnosticSeverity".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![Field {
+                    label: "Error".to_string(),
+                    ty: DeclarationId(2007),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -36909,76 +36810,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/induction.dag", 31534, 31778),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 4530, 4561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1102),
-            name: Some("RecurrenceForm".to_string()),
+            id: DeclarationId(1084),
+            name: Some("LensEnforcement".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "param".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "branches".to_string(),
-                        ty: DeclarationId(93),
-                    },
-                    Field {
-                        label: "divisor".to_string(),
-                        ty: DeclarationId(93),
+                        label: "project".to_string(),
+                        ty: DeclarationId(2008),
                     },
                     Field {
-                        label: "work_exponent".to_string(),
-                        ty: DeclarationId(93),
+                        label: "violates".to_string(),
+                        ty: DeclarationId(2009),
                     },
                 ],
             },
-            type_params: vec![],
-            phantom_params: 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", 32935, 33026),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1103),
-            name: Some("int_add_checked".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(1985),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    33617,
-                    33868,
-                )),
-            },
-            type_params: vec![],
-            phantom_params: 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", 33574, 33868),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1104),
-            name: Some("int_mul_checked".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(1986),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    33913,
-                    34702,
-                )),
-            },
-            type_params: vec![],
+            type_params: vec![
+                DeclarationId(1085),
+                DeclarationId(1086),
+                DeclarationId(1087),
+            ],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -36986,20 +36839,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/induction.dag", 33870, 34702),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 5737, 5862),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1105),
-            name: Some("bounded_int_pow_exponent".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(93)],
-                output: DeclarationId(1987),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    35162,
-                    35285,
-                )),
-            },
+            id: DeclarationId(1085),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -37008,20 +36853,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/induction.dag", 35118, 35285),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 5737, 5862),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1106),
-            name: Some("int_pow_bounded".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(1988),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    35637,
-                    36682,
-                )),
-            },
+            id: DeclarationId(1086),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Budget".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -37030,20 +36867,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/induction.dag", 35589, 36682),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 5737, 5862),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1107),
-            name: Some("ceil_log".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(1989),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    36900,
-                    37015,
-                )),
-            },
+            id: DeclarationId(1087),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Projected".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -37052,26 +36881,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/induction.dag", 36854, 37015),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 5737, 5862),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1108),
-            name: Some("ceil_log_iter".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![
-                    DeclarationId(93),
-                    DeclarationId(93),
-                    DeclarationId(93),
-                    DeclarationId(93),
+            id: DeclarationId(1088),
+            name: Some("EnforceableLens".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "lens".to_string(),
+                        ty: DeclarationId(2010),
+                    },
+                    Field {
+                        label: "enforcement".to_string(),
+                        ty: DeclarationId(2011),
+                    },
                 ],
-                output: DeclarationId(1990),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    37172,
-                    37534,
-                )),
             },
-            type_params: vec![],
+            type_params: vec![
+                DeclarationId(1089),
+                DeclarationId(1090),
+                DeclarationId(1091),
+            ],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -37079,20 +36910,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/induction.dag", 37101, 37534),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 7813, 7943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1109),
-            name: Some("master_theorem".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1102)],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    37589,
-                    39626,
-                )),
-            },
+            id: DeclarationId(1089),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -37101,20 +36924,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/induction.dag", 37536, 39626),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 7813, 7943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1110),
-            name: Some("catamorphism_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(230), DeclarationId(93)],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    39979,
-                    40137,
-                )),
-            },
+            id: DeclarationId(1090),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Budget".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -37123,25 +36938,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/induction.dag", 39909, 40137),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 7813, 7943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1111),
-            name: Some("derive_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![
-                    DeclarationId(230),
-                    DeclarationId(93),
-                    DeclarationId(938),
-                    DeclarationId(93),
-                ],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    40636,
-                    41660,
-                )),
-            },
+            id: DeclarationId(1091),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Projected".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -37150,21 +36952,40 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 40535, 41660),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 7813, 7943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1112),
-            name: Some("tree_traversal_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    41993,
-                    42050,
-                )),
+            id: DeclarationId(1092),
+            name: Some("EnforcedApplication".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "enforceable_lens".to_string(),
+                        ty: DeclarationId(2012),
+                    },
+                    Field {
+                        label: "section".to_string(),
+                        ty: DeclarationId(1082),
+                    },
+                    Field {
+                        label: "budget".to_string(),
+                        ty: DeclarationId(1094),
+                    },
+                    Field {
+                        label: "diagnostic_severity".to_string(),
+                        ty: DeclarationId(1083),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                ],
             },
-            type_params: vec![],
+            type_params: vec![
+                DeclarationId(1093),
+                DeclarationId(1094),
+                DeclarationId(1095),
+            ],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -37172,20 +36993,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/induction.dag", 41954, 42050),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 9637, 9855),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1113),
-            name: Some("nested_iteration_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    42093,
-                    42151,
-                )),
-            },
+            id: DeclarationId(1093),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -37194,20 +37007,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/induction.dag", 42052, 42151),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 9637, 9855),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1114),
-            name: Some("linear_scan_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    42251,
-                    42306,
-                )),
-            },
+            id: DeclarationId(1094),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Budget".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -37216,20 +37021,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/induction.dag", 42215, 42306),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 9637, 9855),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1115),
-            name: Some("binary_search_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    42503,
-                    42618,
-                )),
-            },
+            id: DeclarationId(1095),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Projected".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -37238,21 +37035,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/induction.dag", 42465, 42618),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 9637, 9855),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1116),
-            name: Some("mergesort_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    42698,
-                    42813,
-                )),
+            id: DeclarationId(1096),
+            name: Some("IntrospectApplication".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "lens".to_string(),
+                        ty: DeclarationId(2013),
+                    },
+                    Field {
+                        label: "section".to_string(),
+                        ty: DeclarationId(1082),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
+                    },
+                ],
             },
-            type_params: vec![],
+            type_params: vec![DeclarationId(1097)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -37260,20 +37064,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/induction.dag", 42664, 42813),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 10728, 10828),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1117),
-            name: Some("karatsuba_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    42980,
-                    43099,
-                )),
-            },
+            id: DeclarationId(1097),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -37282,281 +37078,965 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 42946, 43099),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 10728, 10828),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1118),
-            name: Some("strassen_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    43264,
-                    43378,
-                )),
+            id: DeclarationId(1098),
+            name: Some("python_language_spec_free_monoid_concat_contract".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1011),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "dag_method".to_string(),
+                        FieldValue::Record(vec![(
+                            "decl".to_string(),
+                            FieldValue::Reference(DeclarationId(256)),
+                        )]),
+                    ),
+                    (
+                        "runtime_template".to_string(),
+                        FieldValue::Literal(LiteralBits::String("[*{left}, *{right}]".to_string())),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "[*{left}, *{right}]".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 43231, 43378),
+            span: SourceSpan::new(
+                "src/v3/std/python_method_template_contracts.dag",
+                3320,
+                3612,
+            ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1119),
-            name: Some("trial_division_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    43495,
-                    43520,
-                )),
+            id: DeclarationId(1099),
+            name: Some("python_language_spec_free_monoid_length_contract".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1011),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "dag_method".to_string(),
+                        FieldValue::Record(vec![(
+                            "decl".to_string(),
+                            FieldValue::Reference(DeclarationId(274)),
+                        )]),
+                    ),
+                    (
+                        "runtime_template".to_string(),
+                        FieldValue::Literal(LiteralBits::String("len({recv})".to_string())),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "len({recv})".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 43456, 43520),
+            span: SourceSpan::new(
+                "src/v3/std/python_method_template_contracts.dag",
+                3614,
+                3890,
+            ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1120),
-            name: Some("cube_root_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    43555,
-                    43580,
-                )),
+            id: DeclarationId(1100),
+            name: Some("python_language_spec_free_monoid_emptiness_contract".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1011),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "dag_method".to_string(),
+                        FieldValue::Record(vec![(
+                            "decl".to_string(),
+                            FieldValue::Reference(DeclarationId(270)),
+                        )]),
+                    ),
+                    (
+                        "runtime_template".to_string(),
+                        FieldValue::Literal(LiteralBits::String("(len({recv}) == 0)".to_string())),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "(len({recv}) == 0)".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 43521, 43580),
+            span: SourceSpan::new(
+                "src/v3/std/python_method_template_contracts.dag",
+                3997,
+                4292,
+            ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1121),
-            name: Some("kth_root_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(93)],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    43662,
-                    43693,
-                )),
+            id: DeclarationId(1101),
+            name: Some("python_language_spec_free_monoid_fold_contract".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1011),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "dag_method".to_string(),
+                        FieldValue::Record(vec![(
+                            "decl".to_string(),
+                            FieldValue::Reference(DeclarationId(266)),
+                        )]),
+                    ),
+                    (
+                        "runtime_template".to_string(),
+                        FieldValue::Literal(LiteralBits::String(
+                            "__v3_fold({recv}, {init}, {body})".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "__v3_fold({recv}, {init}, {body})".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 43623, 43693),
+            span: SourceSpan::new(
+                "src/v3/std/python_method_template_contracts.dag",
+                4665,
+                4981,
+            ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1122),
-            name: Some("bfs_dfs_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    43929,
-                    43980,
-                )),
+            id: DeclarationId(1102),
+            name: Some("python_language_spec_map_contract".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1011),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "dag_method".to_string(),
+                        FieldValue::Record(vec![(
+                            "decl".to_string(),
+                            FieldValue::Reference(DeclarationId(277)),
+                        )]),
+                    ),
+                    (
+                        "runtime_template".to_string(),
+                        FieldValue::Literal(LiteralBits::String(
+                            "[{body} for {item} in {recv}]".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "[{body} for {item} in {recv}]".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 43897, 43980),
+            span: SourceSpan::new(
+                "src/v3/std/python_method_template_contracts.dag",
+                5189,
+                5483,
+            ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1123),
-            name: Some("dijkstra_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    44071,
-                    44353,
-                )),
+            id: DeclarationId(1103),
+            name: Some("python_filter_method_template_contract".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1011),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
-            value_body: 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(
+                            "[x for x in {recv} if {arg}(x)]".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "[x for x in {recv} if {arg}(x)]".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 44038, 44353),
+            span: SourceSpan::new(
+                "src/v3/std/python_method_template_contracts.dag",
+                5485,
+                5791,
+            ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1124),
-            name: Some("bellman_ford_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    44456,
-                    44616,
-                )),
+            id: DeclarationId(1104),
+            name: Some("python_any_method_template_contract".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1011),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
-            value_body: 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(
+                            "any({arg}(x) for x in {recv})".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "any({arg}(x) for x in {recv})".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 44419, 44616),
+            span: SourceSpan::new(
+                "src/v3/std/python_method_template_contracts.dag",
+                5793,
+                6089,
+            ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1125),
-            name: Some("floyd_warshall_bound".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(1085),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/induction.dag",
-                    44723,
-                    44761,
-                )),
+            id: DeclarationId(1105),
+            name: Some("python_all_method_template_contract".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1011),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
-            value_body: 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(
+                            "all({arg}(x) for x in {recv})".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "all({arg}(x) for x in {recv})".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 44684, 44761),
+            span: SourceSpan::new(
+                "src/v3/std/python_method_template_contracts.dag",
+                6091,
+                6387,
+            ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1126),
-            name: Some("signed_int_diagnostic_order".to_string()),
+            id: DeclarationId(1106),
+            name: Some("python_flat_map_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1300),
-                }],
+                template: DeclarationId(1011),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2018)),
+            meta_tag: Some(DeclarationId(1011)),
             specialization_parent: None,
             inhabits: None,
-            value_body: Some(ValueBody::List(vec![
-                FieldValue::Reference(DeclarationId(77)),
-                FieldValue::Reference(DeclarationId(78)),
-                FieldValue::Reference(DeclarationId(79)),
-                FieldValue::Reference(DeclarationId(80)),
-                FieldValue::Reference(DeclarationId(81)),
-            ])),
+            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(
+                            "[y for x in {recv} for y in {arg}(x)]".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "[y for x in {recv} for y in {arg}(x)]".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1200, 1304),
+            span: SourceSpan::new(
+                "src/v3/std/python_method_template_contracts.dag",
+                6389,
+                6711,
+            ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1127),
-            name: Some("unsigned_int_diagnostic_order".to_string()),
+            id: DeclarationId(1107),
+            name: Some("python_method_template_contracts".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1300),
+                    value: DeclarationId(1011),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2019)),
+            meta_tag: Some(DeclarationId(2014)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
-                FieldValue::Reference(DeclarationId(82)),
-                FieldValue::Reference(DeclarationId(83)),
-                FieldValue::Reference(DeclarationId(84)),
-                FieldValue::Reference(DeclarationId(85)),
-                FieldValue::Reference(DeclarationId(86)),
+                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("len({recv})".to_string())),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "len({recv})".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            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("{arg}.join({recv})".to_string())),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "{arg}.join({recv})".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            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})".to_string())),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "{recv}.split({arg})".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            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}[-1] if {recv} else None".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "{recv}[-1] if {recv} else None".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            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}[0] if {recv} else None".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "{recv}[0] if {recv} else None".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            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(
+                            "list(enumerate({recv}))".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "list(enumerate({recv}))".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            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(
+                            "[ord(c) for c in {recv}]".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "[ord(c) for c in {recv}]".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ]),
+                FieldValue::Reference(DeclarationId(1103)),
+                FieldValue::Reference(DeclarationId(1104)),
+                FieldValue::Reference(DeclarationId(1105)),
+                FieldValue::Reference(DeclarationId(1106)),
+                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}[{arg}:]".to_string())),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "{recv}[{arg}:]".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            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}[:{arg}]".to_string())),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "{recv}[:{arg}]".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "dag_method".to_string(),
+                        FieldValue::Record(vec![(
+                            "decl".to_string(),
+                            FieldValue::Reference(DeclarationId(294)),
+                        )]),
+                    ),
+                    (
+                        "runtime_template".to_string(),
+                        FieldValue::Literal(LiteralBits::String(
+                            "sorted({recv}, key={arg})".to_string(),
+                        )),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "sorted({recv}, key={arg})".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "dag_method".to_string(),
+                        FieldValue::Record(vec![(
+                            "decl".to_string(),
+                            FieldValue::Reference(DeclarationId(250)),
+                        )]),
+                    ),
+                    (
+                        "runtime_template".to_string(),
+                        FieldValue::Literal(LiteralBits::String("{recv} + [{arg}]".to_string())),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "{recv} + [{arg}]".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ]),
+                FieldValue::Record(vec![
+                    (
+                        "dag_method".to_string(),
+                        FieldValue::Record(vec![(
+                            "decl".to_string(),
+                            FieldValue::Reference(DeclarationId(297)),
+                        )]),
+                    ),
+                    (
+                        "runtime_template".to_string(),
+                        FieldValue::Literal(LiteralBits::String("{arg} in {recv}".to_string())),
+                    ),
+                    (
+                        "emit_template".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1906),
+                            payload: vec![FieldValue::Literal(LiteralBits::String(
+                                "{arg} in {recv}".to_string(),
+                            ))],
+                        },
+                    ),
+                    (
+                        "wraps_result".to_string(),
+                        FieldValue::Literal(LiteralBits::Bool(false)),
+                    ),
+                    (
+                        "placeholder_convention".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1905),
+                            payload: vec![],
+                        },
+                    ),
+                ]),
             ])),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1378, 1489),
+            span: SourceSpan::new(
+                "src/v3/std/python_method_template_contracts.dag",
+                6713,
+                9706,
+            ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1128),
-            name: Some("Lens".to_string()),
+            id: DeclarationId(1108),
+            name: Some("NamedField".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "name".to_string(),
+                        label: "label".to_string(),
                         ty: DeclarationId(230),
                     },
                     Field {
-                        label: "read".to_string(),
-                        ty: DeclarationId(2021),
-                    },
-                    Field {
-                        label: "sequential".to_string(),
-                        ty: DeclarationId(2022),
-                    },
-                    Field {
-                        label: "branch".to_string(),
-                        ty: DeclarationId(2023),
-                    },
-                    Field {
-                        label: "iterate".to_string(),
-                        ty: DeclarationId(2024),
-                    },
-                    Field {
-                        label: "validate".to_string(),
-                        ty: DeclarationId(2025),
+                        label: "value".to_string(),
+                        ty: DeclarationId(1109),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(1129)],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens.dag", 4121, 4318),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1129),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("C".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -37565,68 +38045,36 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens.dag", 4121, 4318),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 760, 810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1130),
-            name: Some("SectionRef".to_string()),
+            id: DeclarationId(1109),
+            name: Some("Value".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "DeclarationScope".to_string(),
-                        ty: DeclarationId(2026),
+                        label: "LiteralValue".to_string(),
+                        ty: DeclarationId(2016),
                     },
                     Field {
-                        label: "NodeScope".to_string(),
-                        ty: DeclarationId(2027),
+                        label: "RecordValue".to_string(),
+                        ty: DeclarationId(2018),
                     },
-                ],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 3285, 3418),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1131),
-            name: Some("DiagnosticSeverity".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![Field {
-                    label: "Error".to_string(),
-                    ty: DeclarationId(2028),
-                }],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 4271, 4302),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1132),
-            name: Some("LensEnforcement".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
                     Field {
-                        label: "project".to_string(),
-                        ty: DeclarationId(2029),
+                        label: "VariantValue".to_string(),
+                        ty: DeclarationId(2019),
                     },
                     Field {
-                        label: "violates".to_string(),
-                        ty: DeclarationId(2030),
+                        label: "NodeRef".to_string(),
+                        ty: DeclarationId(2020),
+                    },
+                    Field {
+                        label: "CardinalityValue".to_string(),
+                        ty: DeclarationId(2021),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(1133), DeclarationId(1134)],
+            type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -37634,13 +38082,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/lens_application.dag", 5251, 5362),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 2122, 2304),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1133),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())),
-            type_params: vec![],
+            id: DeclarationId(1110),
+            name: Some("ProgramObservation".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "observed".to_string(),
+                    ty: DeclarationId(1111),
+                }],
+            },
+            type_params: vec![DeclarationId(1111)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -37648,12 +38101,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/lens_application.dag", 5251, 5362),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 3208, 3264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1134),
+            id: DeclarationId(1111),
             name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Budget".to_string())),
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -37662,37 +38115,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/lens_application.dag", 5251, 5362),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 3208, 3264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1135),
-            name: Some("EnforceableLens".to_string()),
+            id: DeclarationId(1112),
+            name: Some("EvalFrame".to_string()),
             connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "lens".to_string(),
-                        ty: DeclarationId(2031),
-                    },
-                    Field {
-                        label: "enforcement".to_string(),
-                        ty: DeclarationId(2032),
-                    },
-                ],
+                children: vec![Field {
+                    label: "bindings".to_string(),
+                    ty: DeclarationId(2022),
+                }],
             },
-            type_params: vec![DeclarationId(1136), DeclarationId(1137)],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 7313, 7421),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1136),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -37701,12 +38134,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/lens_application.dag", 7313, 7421),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 3907, 3956),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1137),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Budget".to_string())),
+            id: DeclarationId(1113),
+            name: Some("EvalStateStack".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "frames".to_string(),
+                    ty: DeclarationId(2023),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -37715,36 +38153,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/lens_application.dag", 7313, 7421),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 4510, 4559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1138),
-            name: Some("EnforcedApplication".to_string()),
+            id: DeclarationId(1114),
+            name: Some("EvalStateKey".to_string()),
             connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "enforceable_lens".to_string(),
-                        ty: DeclarationId(2033),
-                    },
-                    Field {
-                        label: "section".to_string(),
-                        ty: DeclarationId(1130),
-                    },
-                    Field {
-                        label: "budget".to_string(),
-                        ty: DeclarationId(1140),
-                    },
-                    Field {
-                        label: "diagnostic_severity".to_string(),
-                        ty: DeclarationId(1131),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
+                children: vec![Field {
+                    label: "state".to_string(),
+                    ty: DeclarationId(1113),
+                }],
             },
-            type_params: vec![DeclarationId(1139), DeclarationId(1140)],
+            type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -37752,12 +38172,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/lens_application.dag", 9030, 9226),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 4940, 4985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1139),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())),
+            id: DeclarationId(1115),
+            name: Some("EvalStrategy".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![Field {
+                    label: "ApplicativeOrder".to_string(),
+                    ty: DeclarationId(2024),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -37766,12 +38191,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 9030, 9226),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 5368, 5442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1140),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Budget".to_string())),
+            id: DeclarationId(1116),
+            name: Some("InputEvaluationOrder".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "LeftFirst".to_string(),
+                        ty: DeclarationId(2025),
+                    },
+                    Field {
+                        label: "RightFirst".to_string(),
+                        ty: DeclarationId(2026),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -37780,28 +38216,32 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 9030, 9226),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 5654, 5704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1141),
-            name: Some("IntrospectApplication".to_string()),
+            id: DeclarationId(1117),
+            name: Some("EvalMemoKey".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "lens".to_string(),
-                        ty: DeclarationId(2034),
+                        label: "program".to_string(),
+                        ty: DeclarationId(723),
                     },
                     Field {
-                        label: "section".to_string(),
-                        ty: DeclarationId(1130),
+                        label: "node".to_string(),
+                        ty: DeclarationId(721),
                     },
                     Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
+                        label: "state_key".to_string(),
+                        ty: DeclarationId(1114),
+                    },
+                    Field {
+                        label: "strategy".to_string(),
+                        ty: DeclarationId(1115),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(1142)],
+            type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -37809,12 +38249,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/lens_application.dag", 10099, 10199),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 6013, 6124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1142),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())),
+            id: DeclarationId(1118),
+            name: Some("evaluate".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(721), DeclarationId(2015)],
+                output: DeclarationId(1109),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/runtime.dag", 11265, 11284)),
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -37823,24 +38267,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lens_application.dag", 10099, 10199),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 11196, 11284),
         });
+        declarations.push(Declaration { id: DeclarationId(1119), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1011), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1011)), 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(1907), 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(1905), 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(1120), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1011), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1011)), 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(1907), 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(1905), 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(1121), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1011), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1011)), 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(1907), 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(1905), 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(1122), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1011), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1011)), 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(1907), 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(1905), 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(1123), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(1011) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2027)), 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(1906), 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(1905), 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(1906), 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(1905), 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(1906), 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(1905), 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(1906), 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(1905), 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(1906), 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(1905), 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(1906), 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(1905), 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(1906), 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(1905), payload: vec![] })]), FieldValue::Reference(DeclarationId(1119)), FieldValue::Reference(DeclarationId(1120)), FieldValue::Reference(DeclarationId(1121)), FieldValue::Reference(DeclarationId(1122)), 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(1906), 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(1905), 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(1906), 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(1905), 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(1143),
-            name: Some("Lookup".to_string()),
+            id: DeclarationId(1124),
+            name: Some("DescentEvidence".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "Miss".to_string(),
+                        label: "Strict".to_string(),
+                        ty: DeclarationId(2036),
+                    },
+                    Field {
+                        label: "NonIncreasing".to_string(),
                         ty: DeclarationId(2037),
                     },
                     Field {
-                        label: "Hit".to_string(),
+                        label: "DescentUnknown".to_string(),
                         ty: DeclarationId(2038),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(1144)],
+            type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -37848,12 +38301,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/lookup.dag", 4521, 4563),
+            span: SourceSpan::new("src/v3/std/termination.dag", 742, 810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1144),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("value".to_string())),
+            id: DeclarationId(1125),
+            name: Some("evidence_rank".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1124)],
+                output: DeclarationId(93),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/termination.dag", 856, 938)),
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -37862,15 +38319,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lookup.dag", 4521, 4563),
+            span: SourceSpan::new("src/v3/std/termination.dag", 812, 938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1145),
-            name: Some("miss_int_lookup".to_string()),
+            id: DeclarationId(1126),
+            name: Some("merge_evidence".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(2035),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4601, 4611)),
+                inputs: vec![DeclarationId(1124), DeclarationId(1124)],
+                output: DeclarationId(1124),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/termination.dag",
+                    1082,
+                    1410,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -37880,15 +38341,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lookup.dag", 4565, 4611),
+            span: SourceSpan::new("src/v3/std/termination.dag", 1005, 1410),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1146),
-            name: Some("hit_int_lookup".to_string()),
+            id: DeclarationId(1127),
+            name: Some("join_evidence".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(93)],
-                output: DeclarationId(2036),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4654, 4666)),
+                inputs: vec![DeclarationId(1124), DeclarationId(1124)],
+                output: DeclarationId(1124),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/termination.dag",
+                    1556,
+                    1755,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -37898,970 +38363,395 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lookup.dag", 4613, 4666),
+            span: SourceSpan::new("src/v3/std/termination.dag", 1480, 1755),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1147),
-            name: Some("python_language_spec_free_monoid_concat_contract".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
-                arguments: vec![],
+            id: DeclarationId(1128),
+            name: Some("promote_to_strict".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1124)],
+                output: DeclarationId(1124),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/termination.dag",
+                    2217,
+                    2336,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: None,
             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(256)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String("[*{left}, *{right}]".to_string())),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "[*{left}, *{right}]".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1974),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new(
-                "src/v3/std/python_method_template_contracts.dag",
-                3320,
-                3612,
-            ),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2150, 2336),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1148),
-            name: Some("python_language_spec_free_monoid_length_contract".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
-                arguments: vec![],
+            id: DeclarationId(1129),
+            name: Some("optional_evidence_meet".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(2028), DeclarationId(2029)],
+                output: DeclarationId(2030),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/termination.dag",
+                    2488,
+                    2664,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: None,
             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(274)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String("len({recv})".to_string())),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "len({recv})".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1974),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new(
-                "src/v3/std/python_method_template_contracts.dag",
-                3614,
-                3890,
-            ),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2400, 2664),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1149),
-            name: Some("python_language_spec_free_monoid_emptiness_contract".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
-                arguments: vec![],
+            id: DeclarationId(1130),
+            name: Some("map_evidence_merge_at".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(2031), DeclarationId(230), DeclarationId(1124)],
+                output: DeclarationId(2032),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/termination.dag",
+                    2833,
+                    3007,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: None,
             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(270)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String("(len({recv}) == 0)".to_string())),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "(len({recv}) == 0)".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1974),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new(
-                "src/v3/std/python_method_template_contracts.dag",
-                3997,
-                4292,
-            ),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2701, 3007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1150),
-            name: Some("python_language_spec_free_monoid_fold_contract".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
-                arguments: vec![],
+            id: DeclarationId(1131),
+            name: Some("RankingDimension".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "TreeSize".to_string(),
+                        ty: DeclarationId(2039),
+                    },
+                    Field {
+                        label: "ListLength".to_string(),
+                        ty: DeclarationId(2040),
+                    },
+                    Field {
+                        label: "ArithmeticValue".to_string(),
+                        ty: DeclarationId(2041),
+                    },
+                    Field {
+                        label: "TokenPosition".to_string(),
+                        ty: DeclarationId(2042),
+                    },
+                    Field {
+                        label: "SetCardinality".to_string(),
+                        ty: DeclarationId(2043),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: None,
             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(266)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String(
-                            "__v3_fold({recv}, {init}, {body})".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "__v3_fold({recv}, {init}, {body})".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1974),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new(
-                "src/v3/std/python_method_template_contracts.dag",
-                4665,
-                4981,
-            ),
+            span: SourceSpan::new("src/v3/std/termination.dag", 3306, 3502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1151),
-            name: Some("python_language_spec_map_contract".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
-                arguments: vec![],
+            id: DeclarationId(1132),
+            name: Some("PositiveDescentAmount".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "OneStep".to_string(),
+                        ty: DeclarationId(2044),
+                    },
+                    Field {
+                        label: "AdditionalStep".to_string(),
+                        ty: DeclarationId(2045),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: None,
             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(277)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String(
-                            "[{body} for {item} in {recv}]".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "[{body} for {item} in {recv}]".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1974),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new(
-                "src/v3/std/python_method_template_contracts.dag",
-                5189,
-                5483,
-            ),
+            span: SourceSpan::new("src/v3/std/termination.dag", 4478, 4571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1152),
-            name: Some("python_filter_method_template_contract".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
-                arguments: vec![],
+            id: DeclarationId(1133),
+            name: Some("positive_descent_count".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1132)],
+                output: DeclarationId(93),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/termination.dag",
+                    4881,
+                    4989,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: None,
             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(
-                            "[x for x in {recv} if {arg}(x)]".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "[x for x in {recv} if {arg}(x)]".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1974),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new(
-                "src/v3/std/python_method_template_contracts.dag",
-                5485,
-                5791,
-            ),
+            span: SourceSpan::new("src/v3/std/termination.dag", 4818, 4989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1153),
-            name: Some("python_any_method_template_contract".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
-                arguments: vec![],
+            id: DeclarationId(1134),
+            name: Some("ProportionalDivisor".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "DivideByTwo".to_string(),
+                        ty: DeclarationId(2046),
+                    },
+                    Field {
+                        label: "StrictlyLarger".to_string(),
+                        ty: DeclarationId(2047),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: None,
             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(
-                            "any({arg}(x) for x in {recv})".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "any({arg}(x) for x in {recv})".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1974),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new(
-                "src/v3/std/python_method_template_contracts.dag",
-                5793,
-                6089,
-            ),
+            span: SourceSpan::new("src/v3/std/termination.dag", 5455, 5545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1154),
-            name: Some("python_all_method_template_contract".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
-                arguments: vec![],
+            id: DeclarationId(1135),
+            name: Some("proportional_divisor_to_int".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1134)],
+                output: DeclarationId(93),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/termination.dag",
+                    5609,
+                    5722,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: None,
             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(
-                            "all({arg}(x) for x in {recv})".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "all({arg}(x) for x in {recv})".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1974),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new(
-                "src/v3/std/python_method_template_contracts.dag",
-                6091,
-                6387,
-            ),
+            span: SourceSpan::new("src/v3/std/termination.dag", 5547, 5722),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1155),
-            name: Some("python_flat_map_method_template_contract".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1054),
-                arguments: vec![],
+            id: DeclarationId(1136),
+            name: Some("peano_literal_materialization_cap".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![],
+                output: DeclarationId(93),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/termination.dag",
+                    5952,
+                    5959,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1054)),
+            meta_tag: None,
             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(
-                            "[y for x in {recv} for y in {arg}(x)]".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "[y for x in {recv} for y in {arg}(x)]".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1974),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new(
-                "src/v3/std/python_method_template_contracts.dag",
-                6389,
-                6711,
-            ),
+            span: SourceSpan::new("src/v3/std/termination.dag", 5906, 5959),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1156),
-            name: Some("python_method_template_contracts".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1054),
-                }],
+            id: DeclarationId(1137),
+            name: Some("positive_descent_amount_from_positive_int".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(93)],
+                output: DeclarationId(2033),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/termination.dag",
+                    6420,
+                    6780,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2039)),
+            meta_tag: None,
             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("len({recv})".to_string())),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "len({recv})".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("{arg}.join({recv})".to_string())),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "{arg}.join({recv})".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})".to_string())),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "{recv}.split({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(273)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String(
-                            "{recv}[-1] if {recv} else None".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "{recv}[-1] if {recv} else None".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}[0] if {recv} else None".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "{recv}[0] if {recv} else None".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(
-                            "list(enumerate({recv}))".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "list(enumerate({recv}))".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(252)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String(
-                            "[ord(c) for c in {recv}]".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "[ord(c) for c in {recv}]".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1974),
-                            payload: vec![],
-                        },
-                    ),
-                ]),
-                FieldValue::Reference(DeclarationId(1152)),
-                FieldValue::Reference(DeclarationId(1153)),
-                FieldValue::Reference(DeclarationId(1154)),
-                FieldValue::Reference(DeclarationId(1155)),
-                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}[{arg}:]".to_string())),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "{recv}[{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(299)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String("{recv}[:{arg}]".to_string())),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "{recv}[:{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(294)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String(
-                            "sorted({recv}, key={arg})".to_string(),
-                        )),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "sorted({recv}, key={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(250)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String("{recv} + [{arg}]".to_string())),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "{recv} + [{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(297)),
-                        )]),
-                    ),
-                    (
-                        "runtime_template".to_string(),
-                        FieldValue::Literal(LiteralBits::String("{arg} in {recv}".to_string())),
-                    ),
-                    (
-                        "emit_template".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1975),
-                            payload: vec![FieldValue::Literal(LiteralBits::String(
-                                "{arg} in {recv}".to_string(),
-                            ))],
-                        },
-                    ),
-                    (
-                        "wraps_result".to_string(),
-                        FieldValue::Literal(LiteralBits::Bool(false)),
-                    ),
-                    (
-                        "placeholder_convention".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(1974),
-                            payload: vec![],
-                        },
-                    ),
-                ]),
-            ])),
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/termination.dag", 6341, 6780),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1138),
+            name: Some("proportional_divisor_from_int_at_least_two".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(93)],
+                output: DeclarationId(2034),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/termination.dag",
+                    6860,
+                    7221,
+                )),
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new(
-                "src/v3/std/python_method_template_contracts.dag",
-                6713,
-                9706,
-            ),
+            span: SourceSpan::new("src/v3/std/termination.dag", 6782, 7221),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1157),
-            name: Some("ResourceHandle".to_string()),
+            id: DeclarationId(1139),
+            name: Some("DescentSource".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "ChildAccessor".to_string(),
+                        ty: DeclarationId(2048),
+                    },
+                    Field {
+                        label: "ListShrink".to_string(),
+                        ty: DeclarationId(2049),
+                    },
+                    Field {
+                        label: "ArithmeticSubtractDescent".to_string(),
+                        ty: DeclarationId(2050),
+                    },
+                    Field {
+                        label: "ArithmeticDivideDescent".to_string(),
+                        ty: DeclarationId(2051),
+                    },
+                    Field {
+                        label: "ParserAdvance".to_string(),
+                        ty: DeclarationId(2052),
+                    },
+                    Field {
+                        label: "SetRemoval".to_string(),
+                        ty: DeclarationId(2053),
+                    },
+                    Field {
+                        label: "FoldIteration".to_string(),
+                        ty: DeclarationId(2054),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: 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", 7626, 7947),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1140),
+            name: Some("TerminationProof".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "dimensions".to_string(),
+                    ty: DeclarationId(2055),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: 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", 7949, 8011),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1141),
+            name: Some("ProofEdge".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "type".to_string(),
+                        label: "caller".to_string(),
                         ty: DeclarationId(230),
                     },
                     Field {
-                        label: "resource_id".to_string(),
+                        label: "callee".to_string(),
                         ty: DeclarationId(230),
                     },
                     Field {
-                        label: "key".to_string(),
-                        ty: DeclarationId(230),
+                        label: "evidence".to_string(),
+                        ty: DeclarationId(2056),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: 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", 8156, 8242),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1142),
+            name: Some("StrictEvidence".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![Field {
+                    label: "Strict".to_string(),
+                    ty: DeclarationId(2057),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: 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", 8716, 8746),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1143),
+            name: Some("NonStrictEvidence".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "NonIncreasing".to_string(),
+                        ty: DeclarationId(2058),
                     },
                     Field {
-                        label: "cap".to_string(),
-                        ty: DeclarationId(147),
+                        label: "DescentUnknown".to_string(),
+                        ty: DeclarationId(2059),
                     },
                 ],
             },
@@ -38873,16 +38763,51 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/resources.dag", 739, 827),
+            span: SourceSpan::new("src/v3/std/termination.dag", 9112, 9171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1158),
-            name: Some("ResourceReference".to_string()),
+            id: DeclarationId(1144),
+            name: Some("DescentResidual".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "EvidenceUnknown".to_string(),
+                        ty: DeclarationId(2060),
+                    },
+                    Field {
+                        label: "EvidenceIncomplete".to_string(),
+                        ty: DeclarationId(2061),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: 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", 10238, 10320),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1145),
+            name: Some("DescentExecutionProof".to_string()),
             connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "target".to_string(),
-                    ty: DeclarationId(1300),
-                }],
+                children: vec![
+                    Field {
+                        label: "cluster".to_string(),
+                        ty: DeclarationId(724),
+                    },
+                    Field {
+                        label: "port".to_string(),
+                        ty: DeclarationId(722),
+                    },
+                    Field {
+                        label: "per_path".to_string(),
+                        ty: DeclarationId(2062),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -38892,20 +38817,91 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/resources.dag", 829, 880),
+            span: SourceSpan::new("src/v3/std/termination.dag", 11157, 11263),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1159),
-            name: Some("NamedField".to_string()),
+            id: DeclarationId(1146),
+            name: Some("descent_execution_proof".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(724), DeclarationId(722)],
+                output: DeclarationId(2035),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/termination.dag",
+                    12400,
+                    12439,
+                )),
+            },
+            type_params: vec![],
+            phantom_params: 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", 12279, 12439),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1147),
+            name: Some("RecursionShape".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "DirectRecursion".to_string(),
+                        ty: DeclarationId(2076),
+                    },
+                    Field {
+                        label: "ListRecursion".to_string(),
+                        ty: DeclarationId(2077),
+                    },
+                    Field {
+                        label: "OptionalRecursion".to_string(),
+                        ty: DeclarationId(2078),
+                    },
+                    Field {
+                        label: "SetRecursion".to_string(),
+                        ty: DeclarationId(2079),
+                    },
+                    Field {
+                        label: "MapValueRecursion".to_string(),
+                        ty: DeclarationId(2080),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: 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", 5605, 5878),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1148),
+            name: Some("InductiveField".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "label".to_string(),
+                        label: "type_name".to_string(),
                         ty: DeclarationId(230),
                     },
                     Field {
-                        label: "value".to_string(),
-                        ty: DeclarationId(1160),
+                        label: "variant_name".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "field_name".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "shape".to_string(),
+                        ty: DeclarationId(1147),
+                    },
+                    Field {
+                        label: "element_type".to_string(),
+                        ty: DeclarationId(230),
                     },
                 ],
             },
@@ -38917,32 +38913,86 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 760, 810),
+            span: SourceSpan::new("src/v3/std/induction.dag", 7170, 7592),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1160),
-            name: Some("Value".to_string()),
+            id: DeclarationId(1149),
+            name: Some("recursion_shape_eq".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1147), DeclarationId(1147)],
+                output: DeclarationId(128),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 7662, 8034)),
+            },
+            type_params: vec![],
+            phantom_params: 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", 7594, 8034),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1150),
+            name: Some("inductive_field_eq".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1148), DeclarationId(1148)],
+                output: DeclarationId(128),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8104, 8302)),
+            },
+            type_params: vec![],
+            phantom_params: 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", 8036, 8302),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1151),
+            name: Some("inductive_field_to_dimension".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1148), DeclarationId(230)],
+                output: DeclarationId(1131),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8768, 8799)),
+            },
+            type_params: vec![],
+            phantom_params: 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", 8678, 8799),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1152),
+            name: Some("SubValueRelation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "LiteralValue".to_string(),
-                        ty: DeclarationId(2041),
+                        label: "StrictSubValue".to_string(),
+                        ty: DeclarationId(2081),
                     },
                     Field {
-                        label: "RecordValue".to_string(),
-                        ty: DeclarationId(2043),
+                        label: "IteratedSubValue".to_string(),
+                        ty: DeclarationId(2082),
                     },
                     Field {
-                        label: "VariantValue".to_string(),
-                        ty: DeclarationId(2044),
+                        label: "ArithmeticDescent".to_string(),
+                        ty: DeclarationId(2083),
                     },
                     Field {
-                        label: "NodeRef".to_string(),
-                        ty: DeclarationId(2045),
+                        label: "PreservedValue".to_string(),
+                        ty: DeclarationId(2084),
                     },
                     Field {
-                        label: "CardinalityValue".to_string(),
-                        ty: DeclarationId(2046),
+                        label: "SubValueUnknown".to_string(),
+                        ty: DeclarationId(2085),
                     },
                 ],
             },
@@ -38954,18 +39004,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/runtime.dag", 2122, 2304),
+            span: SourceSpan::new("src/v3/std/induction.dag", 9945, 10181),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1161),
-            name: Some("ProgramObservation".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "observed".to_string(),
-                    ty: DeclarationId(1162),
-                }],
+            id: DeclarationId(1153),
+            name: Some("sub_value_to_evidence".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1152)],
+                output: DeclarationId(1124),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    11134,
+                    11737,
+                )),
             },
-            type_params: vec![DeclarationId(1162)],
+            type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -38973,12 +39026,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/runtime.dag", 3208, 3264),
+            span: SourceSpan::new("src/v3/std/induction.dag", 11062, 11737),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1162),
-            name: None,
-            connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
+            id: DeclarationId(1154),
+            name: Some("shrink_factor_eq".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(959), DeclarationId(959)],
+                output: DeclarationId(128),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    12205,
+                    12691,
+                )),
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -38987,16 +39048,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 3208, 3264),
+            span: SourceSpan::new("src/v3/std/induction.dag", 12143, 12691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1163),
-            name: Some("EvalFrame".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "bindings".to_string(),
-                    ty: DeclarationId(2047),
-                }],
+            id: DeclarationId(1155),
+            name: Some("meet_sub_value".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1152), DeclarationId(1152)],
+                output: DeclarationId(1152),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    13282,
+                    14694,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39006,16 +39070,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 3907, 3956),
+            span: SourceSpan::new("src/v3/std/induction.dag", 13202, 14694),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1164),
-            name: Some("EvalStateStack".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "frames".to_string(),
-                    ty: DeclarationId(2048),
-                }],
+            id: DeclarationId(1156),
+            name: Some("join_sub_value".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1152), DeclarationId(1152)],
+                output: DeclarationId(1152),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    15026,
+                    16329,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39025,16 +39092,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 4510, 4559),
+            span: SourceSpan::new("src/v3/std/induction.dag", 14946, 16329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1165),
-            name: Some("EvalStateKey".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "state".to_string(),
-                    ty: DeclarationId(1164),
-                }],
+            id: DeclarationId(1157),
+            name: Some("compose_sub_value".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1152), DeclarationId(1148)],
+                output: DeclarationId(1152),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    17472,
+                    17594,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39044,16 +39114,96 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 4940, 4985),
+            span: SourceSpan::new("src/v3/std/induction.dag", 17384, 17594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1166),
-            name: Some("EvalStrategy".to_string()),
+            id: DeclarationId(1158),
+            name: Some("compose_sub_value_relations".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1152), DeclarationId(1152)],
+                output: DeclarationId(1152),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    18450,
+                    19796,
+                )),
+            },
+            type_params: vec![],
+            phantom_params: 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", 18342, 19796),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1159),
+            name: Some("sub_value_to_call_pattern".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1152)],
+                output: DeclarationId(2063),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    20571,
+                    21367,
+                )),
+            },
+            type_params: vec![],
+            phantom_params: 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", 20498, 21367),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1160),
+            name: Some("sub_value_to_lowering_target".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1152)],
+                output: DeclarationId(2064),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    21959,
+                    22864,
+                )),
+            },
+            type_params: vec![],
+            phantom_params: 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", 21880, 22864),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1161),
+            name: Some("PolynomialExponent".to_string()),
             connective: TypeConnective::Disj {
-                variants: vec![Field {
-                    label: "ApplicativeOrder".to_string(),
-                    ty: DeclarationId(2049),
-                }],
+                variants: vec![
+                    Field {
+                        label: "IntegerExpZero".to_string(),
+                        ty: DeclarationId(2086),
+                    },
+                    Field {
+                        label: "IntegerExpPos".to_string(),
+                        ty: DeclarationId(2087),
+                    },
+                    Field {
+                        label: "FractionExp".to_string(),
+                        ty: DeclarationId(2088),
+                    },
+                    Field {
+                        label: "LogBasedExp".to_string(),
+                        ty: DeclarationId(2089),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39063,20 +39213,42 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 5368, 5442),
+            span: SourceSpan::new("src/v3/std/induction.dag", 24107, 24362),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1162),
+            name: Some("poly_exp_degree_one".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![],
+                output: DeclarationId(1161),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    24411,
+                    24450,
+                )),
+            },
+            type_params: vec![],
+            phantom_params: 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", 24364, 24450),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1167),
-            name: Some("InputEvaluationOrder".to_string()),
+            id: DeclarationId(1163),
+            name: Some("AtomicCost".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "LeftFirst".to_string(),
-                        ty: DeclarationId(2050),
+                        label: "PolyCost".to_string(),
+                        ty: DeclarationId(2090),
                     },
                     Field {
-                        label: "RightFirst".to_string(),
-                        ty: DeclarationId(2051),
+                        label: "LogCost".to_string(),
+                        ty: DeclarationId(2091),
                     },
                 ],
             },
@@ -39088,28 +39260,40 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 5654, 5704),
+            span: SourceSpan::new("src/v3/std/induction.dag", 24962, 25079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1168),
-            name: Some("EvalMemoKey".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
+            id: DeclarationId(1164),
+            name: Some("CostBound".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
                     Field {
-                        label: "program".to_string(),
-                        ty: DeclarationId(723),
+                        label: "ConstantBound".to_string(),
+                        ty: DeclarationId(2092),
                     },
                     Field {
-                        label: "node".to_string(),
-                        ty: DeclarationId(721),
+                        label: "AtomicBound".to_string(),
+                        ty: DeclarationId(2093),
                     },
                     Field {
-                        label: "state_key".to_string(),
-                        ty: DeclarationId(1165),
+                        label: "ProductBound".to_string(),
+                        ty: DeclarationId(2095),
                     },
                     Field {
-                        label: "strategy".to_string(),
-                        ty: DeclarationId(1166),
+                        label: "SumOfProductsBound".to_string(),
+                        ty: DeclarationId(2098),
+                    },
+                    Field {
+                        label: "SumBound".to_string(),
+                        ty: DeclarationId(2100),
+                    },
+                    Field {
+                        label: "ForeverBound".to_string(),
+                        ty: DeclarationId(2101),
+                    },
+                    Field {
+                        label: "ErrorBound".to_string(),
+                        ty: DeclarationId(2102),
                     },
                 ],
             },
@@ -39121,15 +39305,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 6013, 6124),
+            span: SourceSpan::new("src/v3/std/induction.dag", 26709, 27469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1169),
-            name: Some("evaluate".to_string()),
+            id: DeclarationId(1165),
+            name: Some("sum_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(721), DeclarationId(2040)],
-                output: DeclarationId(1160),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/runtime.dag", 11265, 11284)),
+                inputs: vec![DeclarationId(2065)],
+                output: DeclarationId(1164),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    27880,
+                    27986,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39139,17 +39327,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/runtime.dag", 11196, 11284),
+            span: SourceSpan::new("src/v3/std/induction.dag", 27830, 27986),
         });
-        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()),
-            connective: TypeConnective::Conj { children: vec![] },
+            id: DeclarationId(1166),
+            name: Some("cost_bound_is_sum_bound".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1164)],
+                output: DeclarationId(128),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    28310,
+                    28563,
+                )),
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -39158,22 +39349,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/services.dag", 3669, 3687),
+            span: SourceSpan::new("src/v3/std/induction.dag", 28261, 28563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1176),
-            name: Some("RestEndpointBinding".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "method".to_string(),
-                        ty: DeclarationId(198),
-                    },
-                    Field {
-                        label: "path".to_string(),
-                        ty: DeclarationId(730),
-                    },
-                ],
+            id: DeclarationId(1167),
+            name: Some("cost_bound_to_symbolic".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1164)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(544))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39183,16 +39367,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/services.dag", 4599, 4671),
+            span: SourceSpan::new("src/v3/std/induction.dag", 29000, 29517),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1177),
-            name: Some("CallableRef".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "decl".to_string(),
-                    ty: DeclarationId(1300),
-                }],
+            id: DeclarationId(1168),
+            name: Some("atomic_cost_to_symbolic".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1163)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(553))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39202,26 +39385,19 @@ 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/induction.dag", 29519, 29839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1178),
-            name: Some("Operation".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "callable".to_string(),
-                        ty: DeclarationId(1177),
-                    },
-                    Field {
-                        label: "inputs".to_string(),
-                        ty: DeclarationId(2053),
-                    },
-                    Field {
-                        label: "endpoint".to_string(),
-                        ty: DeclarationId(1176),
-                    },
-                ],
+            id: DeclarationId(1169),
+            name: Some("product_atoms_to_symbolic".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(2066)],
+                output: DeclarationId(905),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    29913,
+                    29949,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39231,36 +39407,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/services.dag", 6731, 6841),
+            span: SourceSpan::new("src/v3/std/induction.dag", 29841, 29949),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1179),
-            name: Some("modeled_gunbc_ci_workflow".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1360),
-                arguments: vec![],
+            id: DeclarationId(1170),
+            name: Some("product_term_to_symbolic".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(2067)],
+                output: DeclarationId(905),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(555))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1360)),
+            meta_tag: None,
             specialization_parent: None,
             inhabits: None,
-            value_body: Some(ValueBody::Unparsed(SourceSpan::new(
-                "src/v3/std/t_ci_workflow_as_data_demo.dag",
-                1238,
-                2494,
-            ))),
+            value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 1195, 2494),
+            span: SourceSpan::new("src/v3/std/induction.dag", 29951, 30060),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1180),
-            name: Some("ci_demo_timing_read".to_string()),
+            id: DeclarationId(1171),
+            name: Some("sum_products_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2054),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(597))),
+                inputs: vec![DeclarationId(2069)],
+                output: DeclarationId(905),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    30137,
+                    30172,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39270,15 +39447,19 @@ 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", 3007, 4266),
+            span: SourceSpan::new("src/v3/std/induction.dag", 30062, 30172),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1181),
-            name: Some("ci_wad_modeled_workflow_timing_witness".to_string()),
+            id: DeclarationId(1172),
+            name: Some("cost_constant".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2055),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(599))),
+                inputs: vec![],
+                output: DeclarationId(1164),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    30206,
+                    30223,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39288,15 +39469,19 @@ 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", 4560, 4682),
+            span: SourceSpan::new("src/v3/std/induction.dag", 30174, 30223),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1182),
-            name: Some("_ci_wad_seed_list_declaration_empty".to_string()),
+            id: DeclarationId(1173),
+            name: Some("cost_linear".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(2056),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(601))),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(1164),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    30267,
+                    30351,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39306,15 +39491,19 @@ 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", 4876, 4945),
+            span: SourceSpan::new("src/v3/std/induction.dag", 30224, 30351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1183),
-            name: Some("_ci_wad_seed_list_behavior_empty".to_string()),
+            id: DeclarationId(1174),
+            name: Some("cost_poly".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(2057),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(603))),
+                inputs: vec![DeclarationId(230), DeclarationId(93)],
+                output: DeclarationId(1164),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    30406,
+                    30805,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39324,15 +39513,19 @@ 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", 4947, 5010),
+            span: SourceSpan::new("src/v3/std/induction.dag", 30352, 30805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1184),
-            name: Some("_ci_wad_seed_list_dagport_empty".to_string()),
+            id: DeclarationId(1175),
+            name: Some("cost_root".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(2058),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(605))),
+                inputs: vec![DeclarationId(230), DeclarationId(93)],
+                output: DeclarationId(1164),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    30855,
+                    31129,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39342,15 +39535,19 @@ 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", 5012, 5073),
+            span: SourceSpan::new("src/v3/std/induction.dag", 30806, 31129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1185),
-            name: Some("_ci_wad_seed_list_cluster_empty".to_string()),
+            id: DeclarationId(1176),
+            name: Some("cost_sqrt".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(2059),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(607))),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(1164),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    31171,
+                    31204,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39360,15 +39557,19 @@ 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", 5075, 5136),
+            span: SourceSpan::new("src/v3/std/induction.dag", 31130, 31204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1186),
-            name: Some("_ci_wad_empty_list_diagnostic".to_string()),
+            id: DeclarationId(1177),
+            name: Some("cost_cbrt".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(2060),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(609))),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(1164),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    31246,
+                    31279,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39378,15 +39579,19 @@ 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", 5138, 5200),
+            span: SourceSpan::new("src/v3/std/induction.dag", 31205, 31279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1187),
-            name: Some("_ci_wad_empty_list_witness_tm".to_string()),
+            id: DeclarationId(1178),
+            name: Some("cost_log".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(2062),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(611))),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(1164),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    31320,
+                    31370,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39396,15 +39601,19 @@ 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", 5202, 5280),
+            span: SourceSpan::new("src/v3/std/induction.dag", 31280, 31370),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1188),
-            name: Some("_ci_wad_witnesses_singleton_tm".to_string()),
+            id: DeclarationId(1179),
+            name: Some("cost_nlogn".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1222)],
-                output: DeclarationId(2064),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(615))),
+                inputs: vec![DeclarationId(230)],
+                output: DeclarationId(1164),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    31414,
+                    31532,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39414,15 +39623,19 @@ 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", 5282, 5443),
+            span: SourceSpan::new("src/v3/std/induction.dag", 31372, 31532),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1189),
-            name: Some("_ci_wad_violations_singleton".to_string()),
+            id: DeclarationId(1180),
+            name: Some("cost_graph_linear".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(982)],
-                output: DeclarationId(2065),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(618))),
+                inputs: vec![DeclarationId(230), DeclarationId(230)],
+                output: DeclarationId(1164),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    31602,
+                    31778,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39432,15 +39645,52 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5445, 5577),
+            span: SourceSpan::new("src/v3/std/induction.dag", 31534, 31778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1190),
-            name: Some("_ci_wad_dimension_ok_tm_payload".to_string()),
+            id: DeclarationId(1181),
+            name: Some("RecurrenceForm".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "param".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "branches".to_string(),
+                        ty: DeclarationId(93),
+                    },
+                    Field {
+                        label: "divisor".to_string(),
+                        ty: DeclarationId(93),
+                    },
+                    Field {
+                        label: "work_exponent".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", 32935, 33026),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1182),
+            name: Some("int_add_checked".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1222)],
-                output: DeclarationId(2066),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(622))),
+                inputs: vec![DeclarationId(93), DeclarationId(93)],
+                output: DeclarationId(2070),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    33617,
+                    33868,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39450,15 +39700,19 @@ 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", 5579, 5803),
+            span: SourceSpan::new("src/v3/std/induction.dag", 33574, 33868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1191),
-            name: Some("_ci_wad_dimension_fail_tm_payload".to_string()),
+            id: DeclarationId(1183),
+            name: Some("int_mul_checked".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1222), DeclarationId(982)],
-                output: DeclarationId(2067),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(627))),
+                inputs: vec![DeclarationId(93), DeclarationId(93)],
+                output: DeclarationId(2071),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    33913,
+                    34702,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39468,15 +39722,19 @@ 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", 5805, 6086),
+            span: SourceSpan::new("src/v3/std/induction.dag", 33870, 34702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1192),
-            name: Some("report_dim_ok_tm".to_string()),
+            id: DeclarationId(1184),
+            name: Some("bounded_int_pow_exponent".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(1222)],
-                output: DeclarationId(2068),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(634))),
+                inputs: vec![DeclarationId(93)],
+                output: DeclarationId(2072),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    35162,
+                    35285,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39486,15 +39744,19 @@ 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", 6351, 6590),
+            span: SourceSpan::new("src/v3/std/induction.dag", 35118, 35285),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1193),
-            name: Some("report_dim_fail_tm".to_string()),
+            id: DeclarationId(1185),
+            name: Some("int_pow_bounded".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(1222), DeclarationId(982)],
-                output: DeclarationId(2069),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(641))),
+                inputs: vec![DeclarationId(93), DeclarationId(93)],
+                output: DeclarationId(2073),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    35637,
+                    36682,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39504,15 +39766,19 @@ 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", 6592, 6867),
+            span: SourceSpan::new("src/v3/std/induction.dag", 35589, 36682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1194),
-            name: Some("report_inhabits_branch_tm".to_string()),
+            id: DeclarationId(1186),
+            name: Some("ceil_log".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(1222), DeclarationId(986)],
-                output: DeclarationId(2070),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(646))),
+                inputs: vec![DeclarationId(93), DeclarationId(93)],
+                output: DeclarationId(2074),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    36900,
+                    37015,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39522,15 +39788,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/t_ci_workflow_as_data_demo.dag", 6869, 7120),
+            span: SourceSpan::new("src/v3/std/induction.dag", 36854, 37015),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1195),
-            name: Some("dimension_report_tm_from_witness".to_string()),
+            id: DeclarationId(1187),
+            name: Some("ceil_log_iter".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(2071)],
-                output: DeclarationId(2072),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(656))),
+                inputs: vec![
+                    DeclarationId(93),
+                    DeclarationId(93),
+                    DeclarationId(93),
+                    DeclarationId(93),
+                ],
+                output: DeclarationId(2075),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    37172,
+                    37534,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39540,15 +39815,19 @@ 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", 7122, 7541),
+            span: SourceSpan::new("src/v3/std/induction.dag", 37101, 37534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1196),
-            name: Some("demo_ci_modeled_timing_dimension_report".to_string()),
+            id: DeclarationId(1188),
+            name: Some("master_theorem".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2073),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(664))),
+                inputs: vec![DeclarationId(1181)],
+                output: DeclarationId(1164),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    37589,
+                    39626,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39558,26 +39837,19 @@ 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", 8402, 8703),
+            span: SourceSpan::new("src/v3/std/induction.dag", 37536, 39626),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1197),
-            name: Some("DescentEvidence".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Strict".to_string(),
-                        ty: DeclarationId(2103),
-                    },
-                    Field {
-                        label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2104),
-                    },
-                    Field {
-                        label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2105),
-                    },
-                ],
+            id: DeclarationId(1189),
+            name: Some("catamorphism_bound".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(230), DeclarationId(93)],
+                output: DeclarationId(1164),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    39979,
+                    40137,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39587,15 +39859,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/termination.dag", 742, 810),
+            span: SourceSpan::new("src/v3/std/induction.dag", 39909, 40137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1198),
-            name: Some("evidence_rank".to_string()),
+            id: DeclarationId(1190),
+            name: Some("derive_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1197)],
-                output: DeclarationId(93),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/termination.dag", 856, 938)),
+                inputs: vec![
+                    DeclarationId(230),
+                    DeclarationId(93),
+                    DeclarationId(959),
+                    DeclarationId(93),
+                ],
+                output: DeclarationId(1164),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    40636,
+                    41660,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39605,18 +39886,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/termination.dag", 812, 938),
+            span: SourceSpan::new("src/v3/std/induction.dag", 40535, 41660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1199),
-            name: Some("merge_evidence".to_string()),
+            id: DeclarationId(1191),
+            name: Some("tree_traversal_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1197), DeclarationId(1197)],
-                output: DeclarationId(1197),
+                inputs: vec![],
+                output: DeclarationId(1164),
                 body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/termination.dag",
-                    1082,
-                    1410,
+                    "src/v3/std/induction.dag",
+                    41993,
+                    42050,
                 )),
             },
             type_params: vec![],
@@ -39627,18 +39908,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/termination.dag", 1005, 1410),
+            span: SourceSpan::new("src/v3/std/induction.dag", 41954, 42050),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1200),
-            name: Some("join_evidence".to_string()),
+            id: DeclarationId(1192),
+            name: Some("nested_iteration_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1197), DeclarationId(1197)],
-                output: DeclarationId(1197),
+                inputs: vec![],
+                output: DeclarationId(1164),
                 body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/termination.dag",
-                    1556,
-                    1755,
+                    "src/v3/std/induction.dag",
+                    42093,
+                    42151,
                 )),
             },
             type_params: vec![],
@@ -39649,18 +39930,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/termination.dag", 1480, 1755),
+            span: SourceSpan::new("src/v3/std/induction.dag", 42052, 42151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1201),
-            name: Some("promote_to_strict".to_string()),
+            id: DeclarationId(1193),
+            name: Some("linear_scan_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1197)],
-                output: DeclarationId(1197),
+                inputs: vec![],
+                output: DeclarationId(1164),
                 body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/termination.dag",
-                    2217,
-                    2336,
+                    "src/v3/std/induction.dag",
+                    42251,
+                    42306,
                 )),
             },
             type_params: vec![],
@@ -39671,18 +39952,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/termination.dag", 2150, 2336),
+            span: SourceSpan::new("src/v3/std/induction.dag", 42215, 42306),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1202),
-            name: Some("optional_evidence_meet".to_string()),
+            id: DeclarationId(1194),
+            name: Some("binary_search_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2095), DeclarationId(2096)],
-                output: DeclarationId(2097),
+                inputs: vec![],
+                output: DeclarationId(1164),
                 body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/termination.dag",
-                    2488,
-                    2664,
+                    "src/v3/std/induction.dag",
+                    42503,
+                    42618,
                 )),
             },
             type_params: vec![],
@@ -39693,18 +39974,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/termination.dag", 2400, 2664),
+            span: SourceSpan::new("src/v3/std/induction.dag", 42465, 42618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1203),
-            name: Some("map_evidence_merge_at".to_string()),
+            id: DeclarationId(1195),
+            name: Some("mergesort_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2098), DeclarationId(230), DeclarationId(1197)],
-                output: DeclarationId(2099),
+                inputs: vec![],
+                output: DeclarationId(1164),
                 body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/termination.dag",
-                    2833,
-                    3007,
+                    "src/v3/std/induction.dag",
+                    42698,
+                    42813,
                 )),
             },
             type_params: vec![],
@@ -39715,34 +39996,19 @@ 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", 2701, 3007),
+            span: SourceSpan::new("src/v3/std/induction.dag", 42664, 42813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1204),
-            name: Some("RankingDimension".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "TreeSize".to_string(),
-                        ty: DeclarationId(2106),
-                    },
-                    Field {
-                        label: "ListLength".to_string(),
-                        ty: DeclarationId(2107),
-                    },
-                    Field {
-                        label: "ArithmeticValue".to_string(),
-                        ty: DeclarationId(2108),
-                    },
-                    Field {
-                        label: "TokenPosition".to_string(),
-                        ty: DeclarationId(2109),
-                    },
-                    Field {
-                        label: "SetCardinality".to_string(),
-                        ty: DeclarationId(2110),
-                    },
-                ],
+            id: DeclarationId(1196),
+            name: Some("karatsuba_bound".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![],
+                output: DeclarationId(1164),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    42980,
+                    43099,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39752,22 +40018,19 @@ 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", 3306, 3502),
+            span: SourceSpan::new("src/v3/std/induction.dag", 42946, 43099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1205),
-            name: Some("PositiveDescentAmount".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "OneStep".to_string(),
-                        ty: DeclarationId(2111),
-                    },
-                    Field {
-                        label: "AdditionalStep".to_string(),
-                        ty: DeclarationId(2112),
-                    },
-                ],
+            id: DeclarationId(1197),
+            name: Some("strassen_bound".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![],
+                output: DeclarationId(1164),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    43264,
+                    43378,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39777,18 +40040,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/termination.dag", 4478, 4571),
+            span: SourceSpan::new("src/v3/std/induction.dag", 43231, 43378),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1206),
-            name: Some("positive_descent_count".to_string()),
+            id: DeclarationId(1198),
+            name: Some("trial_division_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1205)],
-                output: DeclarationId(93),
+                inputs: vec![],
+                output: DeclarationId(1164),
                 body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/termination.dag",
-                    4881,
-                    4989,
+                    "src/v3/std/induction.dag",
+                    43495,
+                    43520,
                 )),
             },
             type_params: vec![],
@@ -39799,22 +40062,19 @@ 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", 4818, 4989),
+            span: SourceSpan::new("src/v3/std/induction.dag", 43456, 43520),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1207),
-            name: Some("ProportionalDivisor".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "DivideByTwo".to_string(),
-                        ty: DeclarationId(2113),
-                    },
-                    Field {
-                        label: "StrictlyLarger".to_string(),
-                        ty: DeclarationId(2114),
-                    },
-                ],
+            id: DeclarationId(1199),
+            name: Some("cube_root_bound".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![],
+                output: DeclarationId(1164),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    43555,
+                    43580,
+                )),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -39824,18 +40084,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/termination.dag", 5455, 5545),
+            span: SourceSpan::new("src/v3/std/induction.dag", 43521, 43580),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1208),
-            name: Some("proportional_divisor_to_int".to_string()),
+            id: DeclarationId(1200),
+            name: Some("kth_root_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1207)],
-                output: DeclarationId(93),
+                inputs: vec![DeclarationId(93)],
+                output: DeclarationId(1164),
                 body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/termination.dag",
-                    5609,
-                    5722,
+                    "src/v3/std/induction.dag",
+                    43662,
+                    43693,
                 )),
             },
             type_params: vec![],
@@ -39846,18 +40106,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/termination.dag", 5547, 5722),
+            span: SourceSpan::new("src/v3/std/induction.dag", 43623, 43693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1209),
-            name: Some("peano_literal_materialization_cap".to_string()),
+            id: DeclarationId(1201),
+            name: Some("bfs_dfs_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(93),
+                output: DeclarationId(1164),
                 body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/termination.dag",
-                    5952,
-                    5959,
+                    "src/v3/std/induction.dag",
+                    43929,
+                    43980,
                 )),
             },
             type_params: vec![],
@@ -39868,18 +40128,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/termination.dag", 5906, 5959),
+            span: SourceSpan::new("src/v3/std/induction.dag", 43897, 43980),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1210),
-            name: Some("positive_descent_amount_from_positive_int".to_string()),
+            id: DeclarationId(1202),
+            name: Some("dijkstra_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(93)],
-                output: DeclarationId(2100),
+                inputs: vec![],
+                output: DeclarationId(1164),
                 body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/termination.dag",
-                    6420,
-                    6780,
+                    "src/v3/std/induction.dag",
+                    44071,
+                    44353,
                 )),
             },
             type_params: vec![],
@@ -39890,18 +40150,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/termination.dag", 6341, 6780),
+            span: SourceSpan::new("src/v3/std/induction.dag", 44038, 44353),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1211),
-            name: Some("proportional_divisor_from_int_at_least_two".to_string()),
+            id: DeclarationId(1203),
+            name: Some("bellman_ford_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(93)],
-                output: DeclarationId(2101),
+                inputs: vec![],
+                output: DeclarationId(1164),
                 body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/termination.dag",
-                    6860,
-                    7221,
+                    "src/v3/std/induction.dag",
+                    44456,
+                    44616,
                 )),
             },
             type_params: vec![],
@@ -39912,41 +40172,215 @@ 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", 6782, 7221),
+            span: SourceSpan::new("src/v3/std/induction.dag", 44419, 44616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1212),
-            name: Some("DescentSource".to_string()),
+            id: DeclarationId(1204),
+            name: Some("floyd_warshall_bound".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![],
+                output: DeclarationId(1164),
+                body: ArrowBody::Unparsed(SourceSpan::new(
+                    "src/v3/std/induction.dag",
+                    44723,
+                    44761,
+                )),
+            },
+            type_params: vec![],
+            phantom_params: 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", 44684, 44761),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1205),
+            name: Some("TokenKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "ChildAccessor".to_string(),
+                        label: "KwLet".to_string(),
+                        ty: DeclarationId(2103),
+                    },
+                    Field {
+                        label: "KwIf".to_string(),
+                        ty: DeclarationId(2104),
+                    },
+                    Field {
+                        label: "KwThen".to_string(),
+                        ty: DeclarationId(2105),
+                    },
+                    Field {
+                        label: "KwElse".to_string(),
+                        ty: DeclarationId(2106),
+                    },
+                    Field {
+                        label: "KwFn".to_string(),
+                        ty: DeclarationId(2107),
+                    },
+                    Field {
+                        label: "KwType".to_string(),
+                        ty: DeclarationId(2108),
+                    },
+                    Field {
+                        label: "KwModule".to_string(),
+                        ty: DeclarationId(2109),
+                    },
+                    Field {
+                        label: "KwImport".to_string(),
+                        ty: DeclarationId(2110),
+                    },
+                    Field {
+                        label: "KwMatch".to_string(),
+                        ty: DeclarationId(2111),
+                    },
+                    Field {
+                        label: "KwData".to_string(),
+                        ty: DeclarationId(2112),
+                    },
+                    Field {
+                        label: "KwWhere".to_string(),
+                        ty: DeclarationId(2113),
+                    },
+                    Field {
+                        label: "KwTrue".to_string(),
+                        ty: DeclarationId(2114),
+                    },
+                    Field {
+                        label: "KwFalse".to_string(),
                         ty: DeclarationId(2115),
                     },
                     Field {
-                        label: "ListShrink".to_string(),
+                        label: "Ident".to_string(),
                         ty: DeclarationId(2116),
                     },
                     Field {
-                        label: "ArithmeticSubtractDescent".to_string(),
+                        label: "IntLit".to_string(),
                         ty: DeclarationId(2117),
                     },
                     Field {
-                        label: "ArithmeticDivideDescent".to_string(),
+                        label: "StringLit".to_string(),
                         ty: DeclarationId(2118),
                     },
                     Field {
-                        label: "ParserAdvance".to_string(),
+                        label: "Eq".to_string(),
                         ty: DeclarationId(2119),
                     },
                     Field {
-                        label: "SetRemoval".to_string(),
+                        label: "EqEq".to_string(),
                         ty: DeclarationId(2120),
                     },
                     Field {
-                        label: "FoldIteration".to_string(),
+                        label: "NotEq".to_string(),
                         ty: DeclarationId(2121),
                     },
+                    Field {
+                        label: "Lt".to_string(),
+                        ty: DeclarationId(2122),
+                    },
+                    Field {
+                        label: "Le".to_string(),
+                        ty: DeclarationId(2123),
+                    },
+                    Field {
+                        label: "Gt".to_string(),
+                        ty: DeclarationId(2124),
+                    },
+                    Field {
+                        label: "Ge".to_string(),
+                        ty: DeclarationId(2125),
+                    },
+                    Field {
+                        label: "Plus".to_string(),
+                        ty: DeclarationId(2126),
+                    },
+                    Field {
+                        label: "Minus".to_string(),
+                        ty: DeclarationId(2127),
+                    },
+                    Field {
+                        label: "Star".to_string(),
+                        ty: DeclarationId(2128),
+                    },
+                    Field {
+                        label: "Slash".to_string(),
+                        ty: DeclarationId(2129),
+                    },
+                    Field {
+                        label: "AmpAmp".to_string(),
+                        ty: DeclarationId(2130),
+                    },
+                    Field {
+                        label: "PipePipe".to_string(),
+                        ty: DeclarationId(2131),
+                    },
+                    Field {
+                        label: "Colon".to_string(),
+                        ty: DeclarationId(2132),
+                    },
+                    Field {
+                        label: "Arrow".to_string(),
+                        ty: DeclarationId(2133),
+                    },
+                    Field {
+                        label: "FatArrow".to_string(),
+                        ty: DeclarationId(2134),
+                    },
+                    Field {
+                        label: "PipeArrow".to_string(),
+                        ty: DeclarationId(2135),
+                    },
+                    Field {
+                        label: "Dot".to_string(),
+                        ty: DeclarationId(2136),
+                    },
+                    Field {
+                        label: "LParen".to_string(),
+                        ty: DeclarationId(2137),
+                    },
+                    Field {
+                        label: "RParen".to_string(),
+                        ty: DeclarationId(2138),
+                    },
+                    Field {
+                        label: "LBrace".to_string(),
+                        ty: DeclarationId(2139),
+                    },
+                    Field {
+                        label: "RBrace".to_string(),
+                        ty: DeclarationId(2140),
+                    },
+                    Field {
+                        label: "LBracket".to_string(),
+                        ty: DeclarationId(2141),
+                    },
+                    Field {
+                        label: "RBracket".to_string(),
+                        ty: DeclarationId(2142),
+                    },
+                    Field {
+                        label: "Comma".to_string(),
+                        ty: DeclarationId(2143),
+                    },
+                    Field {
+                        label: "Semicolon".to_string(),
+                        ty: DeclarationId(2144),
+                    },
+                    Field {
+                        label: "Pipe".to_string(),
+                        ty: DeclarationId(2145),
+                    },
+                    Field {
+                        label: "Question".to_string(),
+                        ty: DeclarationId(2146),
+                    },
+                    Field {
+                        label: "Eof".to_string(),
+                        ty: DeclarationId(2147),
+                    },
                 ],
             },
             type_params: vec![],
@@ -39957,43 +40391,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/termination.dag", 7626, 7947),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1213),
-            name: Some("TerminationProof".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "dimensions".to_string(),
-                    ty: DeclarationId(2122),
-                }],
-            },
-            type_params: vec![],
-            phantom_params: 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", 7949, 8011),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 627, 1220),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1214),
-            name: Some("ProofEdge".to_string()),
+            id: DeclarationId(1206),
+            name: Some("Token".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "caller".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "callee".to_string(),
-                        ty: DeclarationId(230),
+                        label: "kind".to_string(),
+                        ty: DeclarationId(1205),
                     },
                     Field {
-                        label: "evidence".to_string(),
-                        ty: DeclarationId(2123),
+                        label: "span".to_string(),
+                        ty: DeclarationId(159),
                     },
                 ],
             },
@@ -40005,16 +40416,66 @@ 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", 8156, 8242),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1355, 1406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1215),
-            name: Some("StrictEvidence".to_string()),
+            id: DeclarationId(1207),
+            name: Some("KeywordTokenKind".to_string()),
             connective: TypeConnective::Disj {
-                variants: vec![Field {
-                    label: "Strict".to_string(),
-                    ty: DeclarationId(2124),
-                }],
+                variants: vec![
+                    Field {
+                        label: "KwLet".to_string(),
+                        ty: DeclarationId(2148),
+                    },
+                    Field {
+                        label: "KwIf".to_string(),
+                        ty: DeclarationId(2149),
+                    },
+                    Field {
+                        label: "KwThen".to_string(),
+                        ty: DeclarationId(2150),
+                    },
+                    Field {
+                        label: "KwElse".to_string(),
+                        ty: DeclarationId(2151),
+                    },
+                    Field {
+                        label: "KwFn".to_string(),
+                        ty: DeclarationId(2152),
+                    },
+                    Field {
+                        label: "KwType".to_string(),
+                        ty: DeclarationId(2153),
+                    },
+                    Field {
+                        label: "KwModule".to_string(),
+                        ty: DeclarationId(2154),
+                    },
+                    Field {
+                        label: "KwImport".to_string(),
+                        ty: DeclarationId(2155),
+                    },
+                    Field {
+                        label: "KwMatch".to_string(),
+                        ty: DeclarationId(2156),
+                    },
+                    Field {
+                        label: "KwData".to_string(),
+                        ty: DeclarationId(2157),
+                    },
+                    Field {
+                        label: "KwWhere".to_string(),
+                        ty: DeclarationId(2158),
+                    },
+                    Field {
+                        label: "KwTrue".to_string(),
+                        ty: DeclarationId(2159),
+                    },
+                    Field {
+                        label: "KwFalse".to_string(),
+                        ty: DeclarationId(2160),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40024,20 +40485,124 @@ 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", 8716, 8746),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1765, 1931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1216),
-            name: Some("NonStrictEvidence".to_string()),
+            id: DeclarationId(1208),
+            name: Some("PunctTokenKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-                        label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2125),
+                        label: "Eq".to_string(),
+                        ty: DeclarationId(2161),
+                    },
+                    Field {
+                        label: "EqEq".to_string(),
+                        ty: DeclarationId(2162),
+                    },
+                    Field {
+                        label: "NotEq".to_string(),
+                        ty: DeclarationId(2163),
+                    },
+                    Field {
+                        label: "Lt".to_string(),
+                        ty: DeclarationId(2164),
+                    },
+                    Field {
+                        label: "Le".to_string(),
+                        ty: DeclarationId(2165),
+                    },
+                    Field {
+                        label: "Gt".to_string(),
+                        ty: DeclarationId(2166),
+                    },
+                    Field {
+                        label: "Ge".to_string(),
+                        ty: DeclarationId(2167),
+                    },
+                    Field {
+                        label: "Plus".to_string(),
+                        ty: DeclarationId(2168),
+                    },
+                    Field {
+                        label: "Minus".to_string(),
+                        ty: DeclarationId(2169),
+                    },
+                    Field {
+                        label: "Star".to_string(),
+                        ty: DeclarationId(2170),
+                    },
+                    Field {
+                        label: "Slash".to_string(),
+                        ty: DeclarationId(2171),
+                    },
+                    Field {
+                        label: "AmpAmp".to_string(),
+                        ty: DeclarationId(2172),
+                    },
+                    Field {
+                        label: "PipePipe".to_string(),
+                        ty: DeclarationId(2173),
+                    },
+                    Field {
+                        label: "Colon".to_string(),
+                        ty: DeclarationId(2174),
+                    },
+                    Field {
+                        label: "Arrow".to_string(),
+                        ty: DeclarationId(2175),
+                    },
+                    Field {
+                        label: "FatArrow".to_string(),
+                        ty: DeclarationId(2176),
+                    },
+                    Field {
+                        label: "PipeArrow".to_string(),
+                        ty: DeclarationId(2177),
+                    },
+                    Field {
+                        label: "Dot".to_string(),
+                        ty: DeclarationId(2178),
+                    },
+                    Field {
+                        label: "LParen".to_string(),
+                        ty: DeclarationId(2179),
+                    },
+                    Field {
+                        label: "RParen".to_string(),
+                        ty: DeclarationId(2180),
+                    },
+                    Field {
+                        label: "LBrace".to_string(),
+                        ty: DeclarationId(2181),
+                    },
+                    Field {
+                        label: "RBrace".to_string(),
+                        ty: DeclarationId(2182),
+                    },
+                    Field {
+                        label: "LBracket".to_string(),
+                        ty: DeclarationId(2183),
+                    },
+                    Field {
+                        label: "RBracket".to_string(),
+                        ty: DeclarationId(2184),
+                    },
+                    Field {
+                        label: "Comma".to_string(),
+                        ty: DeclarationId(2185),
+                    },
+                    Field {
+                        label: "Semicolon".to_string(),
+                        ty: DeclarationId(2186),
+                    },
+                    Field {
+                        label: "Pipe".to_string(),
+                        ty: DeclarationId(2187),
                     },
                     Field {
-                        label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2126),
+                        label: "Question".to_string(),
+                        ty: DeclarationId(2188),
                     },
                 ],
             },
@@ -40049,20 +40614,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/termination.dag", 9112, 9171),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2347, 2653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1217),
-            name: Some("DescentResidual".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
+            id: DeclarationId(1209),
+            name: Some("LocalPunctSpec".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
                     Field {
-                        label: "EvidenceUnknown".to_string(),
-                        ty: DeclarationId(2127),
+                        label: "pattern".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "EvidenceIncomplete".to_string(),
-                        ty: DeclarationId(2128),
+                        label: "kind".to_string(),
+                        ty: DeclarationId(1208),
                     },
                 ],
             },
@@ -40074,24 +40639,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/termination.dag", 10238, 10320),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2863, 2927),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1218),
-            name: Some("DescentExecutionProof".to_string()),
+            id: DeclarationId(1210),
+            name: Some("StringEscapeSpec".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "cluster".to_string(),
-                        ty: DeclarationId(724),
-                    },
-                    Field {
-                        label: "port".to_string(),
-                        ty: DeclarationId(722),
+                        label: "suffix".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "per_path".to_string(),
-                        ty: DeclarationId(2129),
+                        label: "output_codepoint".to_string(),
+                        ty: DeclarationId(93),
                     },
                 ],
             },
@@ -40103,19 +40664,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/termination.dag", 11157, 11263),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 3314, 3380),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1219),
-            name: Some("descent_execution_proof".to_string()),
+            id: DeclarationId(1211),
+            name: Some("behavior_spine".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(724), DeclarationId(722)],
-                output: DeclarationId(2102),
-                body: ArrowBody::Unparsed(SourceSpan::new(
-                    "src/v3/std/termination.dag",
-                    12400,
-                    12439,
-                )),
+                inputs: vec![DeclarationId(828)],
+                output: DeclarationId(2189),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(557))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40125,15 +40682,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/termination.dag", 12279, 12439),
+            span: SourceSpan::new("src/v3/std/workflows.dag", 963, 1018),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1220),
+            id: DeclarationId(1212),
             name: Some("timing_lens_module_path_witness".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
                 output: DeclarationId(158),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(666))),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(559))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40143,10 +40700,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 1419, 1500),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 1517, 1598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1221),
+            id: DeclarationId(1213),
             name: Some("Nanoseconds".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -40162,28 +40719,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/timing_lens.dag", 1961, 1994),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 2059, 2092),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1222),
+            id: DeclarationId(1214),
             name: Some("TimingMeasurement".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Observed".to_string(),
-                        ty: DeclarationId(2132),
+                        ty: DeclarationId(2192),
                     },
                     Field {
                         label: "Unobserved".to_string(),
-                        ty: DeclarationId(2133),
+                        ty: DeclarationId(2193),
                     },
                     Field {
                         label: "Ambiguous".to_string(),
-                        ty: DeclarationId(2134),
+                        ty: DeclarationId(2194),
                     },
                     Field {
                         label: "Stale".to_string(),
-                        ty: DeclarationId(2135),
+                        ty: DeclarationId(2195),
                     },
                 ],
             },
@@ -40195,10 +40752,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 4005, 4105),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 4103, 4203),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1223),
+            id: DeclarationId(1215),
             name: Some("WorkflowObservationAnchor".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -40224,7 +40781,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "attached_at_ns".to_string(),
-                        ty: DeclarationId(1221),
+                        ty: DeclarationId(1213),
                     },
                     Field {
                         label: "workflow_run_id".to_string(),
@@ -40240,10 +40797,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 5566, 5815),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 5664, 5913),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1224),
+            id: DeclarationId(1216),
             name: Some("FileAttachment".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -40265,7 +40822,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "attached_at_ns".to_string(),
-                        ty: DeclarationId(1221),
+                        ty: DeclarationId(1213),
                     },
                 ],
             },
@@ -40277,10 +40834,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 6574, 6747),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 6672, 6845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1225),
+            id: DeclarationId(1217),
             name: Some("gate_62_file_attachment_demo_record".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
@@ -40288,10 +40845,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     DeclarationId(173),
                     DeclarationId(174),
                     DeclarationId(177),
-                    DeclarationId(1221),
+                    DeclarationId(1213),
                 ],
-                output: DeclarationId(1224),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(668))),
+                output: DeclarationId(1216),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(561))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40301,15 +40858,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/timing_lens.dag", 7148, 7475),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7246, 7573),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1226),
+            id: DeclarationId(1218),
             name: Some("TimingObservationSet".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "observations".to_string(),
-                    ty: DeclarationId(2136),
+                    ty: DeclarationId(2196),
                 }],
             },
             type_params: vec![],
@@ -40320,20 +40877,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/timing_lens.dag", 7559, 7633),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7657, 7731),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1227),
+            id: DeclarationId(1219),
             name: Some("TimingObservationEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "anchor".to_string(),
-                        ty: DeclarationId(1223),
+                        ty: DeclarationId(1215),
                     },
                     Field {
                         label: "measurement".to_string(),
-                        ty: DeclarationId(1222),
+                        ty: DeclarationId(1214),
                     },
                 ],
             },
@@ -40345,15 +40902,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/timing_lens.dag", 7635, 7735),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7733, 7833),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1228),
+            id: DeclarationId(1220),
             name: Some("TimingBudget".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "max".to_string(),
-                    ty: DeclarationId(1221),
+                    ty: DeclarationId(1213),
                 }],
             },
             type_params: vec![],
@@ -40364,16 +40921,41 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7873, 7913),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7971, 8011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1229),
+            id: DeclarationId(1221),
+            name: Some("TimingEnforcementProjected".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "TimedUsage".to_string(),
+                        ty: DeclarationId(2197),
+                    },
+                    Field {
+                        label: "NonEvidenceUsage".to_string(),
+                        ty: DeclarationId(2198),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: 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", 9177, 9265),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1222),
             name: Some("TimingLens".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1128),
+                template: DeclarationId(1080),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1129),
-                    value: DeclarationId(1222),
+                    parameter: DeclarationId(1081),
+                    value: DeclarationId(1214),
                 }],
             },
             type_params: vec![],
@@ -40384,15 +40966,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/timing_lens.dag", 8169, 8210),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9521, 9562),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1230),
+            id: DeclarationId(1223),
             name: Some("timing_measurement_unobserved".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1222),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(670))),
+                output: DeclarationId(1214),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(563))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40402,15 +40984,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/timing_lens.dag", 8212, 8282),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9564, 9634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1231),
+            id: DeclarationId(1224),
             name: Some("timing_measurement_lens_combine".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1222), DeclarationId(1222), DeclarationId(128)],
-                output: DeclarationId(1222),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(702))),
+                inputs: vec![DeclarationId(1214), DeclarationId(1214), DeclarationId(128)],
+                output: DeclarationId(1214),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(595))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40420,15 +41002,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/timing_lens.dag", 8440, 9332),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9792, 10684),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1232),
+            id: DeclarationId(1225),
             name: Some("timing_sequential_op".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1222), DeclarationId(1222)],
-                output: DeclarationId(1222),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(705))),
+                inputs: vec![DeclarationId(1214), DeclarationId(1214)],
+                output: DeclarationId(1214),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(598))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40438,15 +41020,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/timing_lens.dag", 9407, 9543),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10759, 10895),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1233),
+            id: DeclarationId(1226),
             name: Some("nanoseconds_zero".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1221),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(708))),
+                output: DeclarationId(1213),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(601))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40456,15 +41038,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/timing_lens.dag", 9545, 9598),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10897, 10950),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1234),
+            id: DeclarationId(1227),
             name: Some("timing_sequential_identity".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1222),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(711))),
+                output: DeclarationId(1214),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(604))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40474,15 +41056,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/timing_lens.dag", 9600, 9698),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10952, 11050),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1235),
+            id: DeclarationId(1228),
             name: Some("timing_branch_op".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1222), DeclarationId(1222)],
-                output: DeclarationId(1222),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(714))),
+                inputs: vec![DeclarationId(1214), DeclarationId(1214)],
+                output: DeclarationId(1214),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(607))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40492,15 +41074,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/timing_lens.dag", 9758, 9891),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11110, 11243),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1236),
+            id: DeclarationId(1229),
             name: Some("timing_lens_empty_corrections".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2130),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(716))),
+                output: DeclarationId(2190),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(609))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40510,15 +41092,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/timing_lens.dag", 9893, 9957),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11245, 11309),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1237),
+            id: DeclarationId(1230),
             name: Some("timing_lens_behavior_span".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(827)],
                 output: DeclarationId(159),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(723))),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(616))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40528,15 +41110,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/timing_lens.dag", 10140, 10339),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11492, 11691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1238),
+            id: DeclarationId(1231),
             name: Some("timing_lens_scaffold_non_evidence_diagnostic".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230), DeclarationId(159)],
-                output: DeclarationId(982),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(728))),
+                output: DeclarationId(1039),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(621))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40546,15 +41128,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/timing_lens.dag", 10586, 10798),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11938, 12150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1239),
+            id: DeclarationId(1232),
             name: Some("timing_lens_degenerate_empty_dag_span".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
                 output: DeclarationId(159),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(733))),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(626))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40564,15 +41146,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/timing_lens.dag", 11032, 11166),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12384, 12518),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1240),
+            id: DeclarationId(1233),
             name: Some("timing_lens_validate_non_observed".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(230)],
-                output: DeclarationId(986),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(749))),
+                output: DeclarationId(1043),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(642))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40582,15 +41164,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/timing_lens.dag", 11628, 12333),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12980, 13685),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1241),
+            id: DeclarationId(1234),
             name: Some("timing_measurement_iterate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1222), DeclarationId(818)],
-                output: DeclarationId(1222),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(758))),
+                inputs: vec![DeclarationId(1214), DeclarationId(818)],
+                output: DeclarationId(1214),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(651))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40600,15 +41182,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/timing_lens.dag", 12658, 13019),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 14010, 14371),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1242),
+            id: DeclarationId(1235),
             name: Some("timing_lens_read".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2131),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(795))),
+                output: DeclarationId(2191),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(688))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40618,15 +41200,502 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13796, 14622),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15148, 15974),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1243),
+            id: DeclarationId(1236),
             name: Some("timing_lens_validate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(1222)],
-                output: DeclarationId(986),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(809))),
+                inputs: vec![DeclarationId(828), DeclarationId(1214)],
+                output: DeclarationId(1043),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(702))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 15976, 16821),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1237),
+            name: Some("timing_enforcement_fault_sentinel_count".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![],
+                output: DeclarationId(76),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(704))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 17931, 18005),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1238),
+            name: Some("timing_enforcement_project".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1214)],
+                output: DeclarationId(1221),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(711))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 18007, 18259),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1239),
+            name: Some("timing_enforcement_violates".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1214), DeclarationId(1220)],
+                output: DeclarationId(128),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(734))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 18261, 18526),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1240),
+            name: Some("timing_lens_monoid".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(19),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(20),
+                    value: DeclarationId(1214),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(2199)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    ("op".to_string(), FieldValue::Reference(DeclarationId(1225))),
+                    (
+                        "identity".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2192),
+                            payload: vec![FieldValue::Record(vec![(
+                                "count".to_string(),
+                                FieldValue::Literal(LiteralBits::Int("0".to_string())),
+                            )])],
+                        },
+                    ),
+                ],
+            }),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18528, 18659),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1241),
+            name: Some("timing_lens".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1222),
+                arguments: vec![],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(1222)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "name".to_string(),
+                        FieldValue::Literal(LiteralBits::String("timing".to_string())),
+                    ),
+                    (
+                        "read".to_string(),
+                        FieldValue::Reference(DeclarationId(1235)),
+                    ),
+                    (
+                        "sequential".to_string(),
+                        FieldValue::Reference(DeclarationId(1240)),
+                    ),
+                    (
+                        "branch".to_string(),
+                        FieldValue::Reference(DeclarationId(1228)),
+                    ),
+                    (
+                        "iterate".to_string(),
+                        FieldValue::Reference(DeclarationId(1234)),
+                    ),
+                    (
+                        "validate".to_string(),
+                        FieldValue::Reference(DeclarationId(1236)),
+                    ),
+                ],
+            }),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18661, 18868),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1242),
+            name: Some("timing_enforcement".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1084),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1085),
+                        value: DeclarationId(1214),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1086),
+                        value: DeclarationId(1220),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1087),
+                        value: DeclarationId(1221),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(2200)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "project".to_string(),
+                        FieldValue::Reference(DeclarationId(1238)),
+                    ),
+                    (
+                        "violates".to_string(),
+                        FieldValue::Reference(DeclarationId(1239)),
+                    ),
+                ],
+            }),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18870, 19055),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1243),
+            name: Some("timing_enforceable".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1088),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1089),
+                        value: DeclarationId(1214),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1090),
+                        value: DeclarationId(1220),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1091),
+                        value: DeclarationId(1221),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(2201)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "lens".to_string(),
+                        FieldValue::Reference(DeclarationId(1241)),
+                    ),
+                    (
+                        "enforcement".to_string(),
+                        FieldValue::Reference(DeclarationId(1242)),
+                    ),
+                ],
+            }),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 19057, 19218),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1244),
+            name: Some("modeled_gunbc_ci_workflow".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1374),
+                arguments: vec![],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(1374)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::Unparsed(SourceSpan::new(
+                "src/v3/std/t_ci_workflow_as_data_demo.dag",
+                1399,
+                2655,
+            ))),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 1356, 2655),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1245),
+            name: Some("ci_demo_timing_read".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(827)],
+                output: DeclarationId(2213),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(776))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 3168, 4427),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1246),
+            name: Some("ci_wad_modeled_workflow_timing_witness".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(827)],
+                output: DeclarationId(2214),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(778))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 4721, 4843),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1247),
+            name: Some("_ci_wad_seed_list_declaration_empty".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![],
+                output: DeclarationId(2215),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(780))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 5037, 5106),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1248),
+            name: Some("_ci_wad_seed_list_behavior_empty".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![],
+                output: DeclarationId(2216),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(782))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 5108, 5171),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1249),
+            name: Some("_ci_wad_seed_list_dagport_empty".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![],
+                output: DeclarationId(2217),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(784))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 5173, 5234),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1250),
+            name: Some("_ci_wad_seed_list_cluster_empty".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![],
+                output: DeclarationId(2218),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(786))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 5236, 5297),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1251),
+            name: Some("_ci_wad_empty_list_diagnostic".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![],
+                output: DeclarationId(2219),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(788))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 5299, 5361),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1252),
+            name: Some("_ci_wad_empty_list_witness_tm".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![],
+                output: DeclarationId(2221),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(790))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 5363, 5441),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1253),
+            name: Some("_ci_wad_witnesses_singleton_tm".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1214)],
+                output: DeclarationId(2223),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(794))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 5443, 5604),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1254),
+            name: Some("_ci_wad_violations_singleton".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1039)],
+                output: DeclarationId(2224),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(797))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 5606, 5738),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1255),
+            name: Some("_ci_wad_dimension_ok_tm_payload".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1214)],
+                output: DeclarationId(2225),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(801))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 5740, 5964),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1256),
+            name: Some("_ci_wad_dimension_fail_tm_payload".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1214), DeclarationId(1039)],
+                output: DeclarationId(2226),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(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/std/t_ci_workflow_as_data_demo.dag", 5966, 6247),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1257),
+            name: Some("report_dim_ok_tm".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(1214)],
+                output: DeclarationId(2227),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(813))),
+            },
+            type_params: vec![],
+            phantom_params: 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", 6512, 6751),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1258),
+            name: Some("report_dim_fail_tm".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(1214), DeclarationId(1039)],
+                output: DeclarationId(2228),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(820))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40636,194 +41705,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/timing_lens.dag", 14624, 15469),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6753, 7028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1244),
-            name: Some("TokenKind".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "KwLet".to_string(),
-                        ty: DeclarationId(2148),
-                    },
-                    Field {
-                        label: "KwIf".to_string(),
-                        ty: DeclarationId(2149),
-                    },
-                    Field {
-                        label: "KwThen".to_string(),
-                        ty: DeclarationId(2150),
-                    },
-                    Field {
-                        label: "KwElse".to_string(),
-                        ty: DeclarationId(2151),
-                    },
-                    Field {
-                        label: "KwFn".to_string(),
-                        ty: DeclarationId(2152),
-                    },
-                    Field {
-                        label: "KwType".to_string(),
-                        ty: DeclarationId(2153),
-                    },
-                    Field {
-                        label: "KwModule".to_string(),
-                        ty: DeclarationId(2154),
-                    },
-                    Field {
-                        label: "KwImport".to_string(),
-                        ty: DeclarationId(2155),
-                    },
-                    Field {
-                        label: "KwMatch".to_string(),
-                        ty: DeclarationId(2156),
-                    },
-                    Field {
-                        label: "KwData".to_string(),
-                        ty: DeclarationId(2157),
-                    },
-                    Field {
-                        label: "KwWhere".to_string(),
-                        ty: DeclarationId(2158),
-                    },
-                    Field {
-                        label: "KwTrue".to_string(),
-                        ty: DeclarationId(2159),
-                    },
-                    Field {
-                        label: "KwFalse".to_string(),
-                        ty: DeclarationId(2160),
-                    },
-                    Field {
-                        label: "Ident".to_string(),
-                        ty: DeclarationId(2161),
-                    },
-                    Field {
-                        label: "IntLit".to_string(),
-                        ty: DeclarationId(2162),
-                    },
-                    Field {
-                        label: "StringLit".to_string(),
-                        ty: DeclarationId(2163),
-                    },
-                    Field {
-                        label: "Eq".to_string(),
-                        ty: DeclarationId(2164),
-                    },
-                    Field {
-                        label: "EqEq".to_string(),
-                        ty: DeclarationId(2165),
-                    },
-                    Field {
-                        label: "NotEq".to_string(),
-                        ty: DeclarationId(2166),
-                    },
-                    Field {
-                        label: "Lt".to_string(),
-                        ty: DeclarationId(2167),
-                    },
-                    Field {
-                        label: "Le".to_string(),
-                        ty: DeclarationId(2168),
-                    },
-                    Field {
-                        label: "Gt".to_string(),
-                        ty: DeclarationId(2169),
-                    },
-                    Field {
-                        label: "Ge".to_string(),
-                        ty: DeclarationId(2170),
-                    },
-                    Field {
-                        label: "Plus".to_string(),
-                        ty: DeclarationId(2171),
-                    },
-                    Field {
-                        label: "Minus".to_string(),
-                        ty: DeclarationId(2172),
-                    },
-                    Field {
-                        label: "Star".to_string(),
-                        ty: DeclarationId(2173),
-                    },
-                    Field {
-                        label: "Slash".to_string(),
-                        ty: DeclarationId(2174),
-                    },
-                    Field {
-                        label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2175),
-                    },
-                    Field {
-                        label: "PipePipe".to_string(),
-                        ty: DeclarationId(2176),
-                    },
-                    Field {
-                        label: "Colon".to_string(),
-                        ty: DeclarationId(2177),
-                    },
-                    Field {
-                        label: "Arrow".to_string(),
-                        ty: DeclarationId(2178),
-                    },
-                    Field {
-                        label: "FatArrow".to_string(),
-                        ty: DeclarationId(2179),
-                    },
-                    Field {
-                        label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2180),
-                    },
-                    Field {
-                        label: "Dot".to_string(),
-                        ty: DeclarationId(2181),
-                    },
-                    Field {
-                        label: "LParen".to_string(),
-                        ty: DeclarationId(2182),
-                    },
-                    Field {
-                        label: "RParen".to_string(),
-                        ty: DeclarationId(2183),
-                    },
-                    Field {
-                        label: "LBrace".to_string(),
-                        ty: DeclarationId(2184),
-                    },
-                    Field {
-                        label: "RBrace".to_string(),
-                        ty: DeclarationId(2185),
-                    },
-                    Field {
-                        label: "LBracket".to_string(),
-                        ty: DeclarationId(2186),
-                    },
-                    Field {
-                        label: "RBracket".to_string(),
-                        ty: DeclarationId(2187),
-                    },
-                    Field {
-                        label: "Comma".to_string(),
-                        ty: DeclarationId(2188),
-                    },
-                    Field {
-                        label: "Semicolon".to_string(),
-                        ty: DeclarationId(2189),
-                    },
-                    Field {
-                        label: "Pipe".to_string(),
-                        ty: DeclarationId(2190),
-                    },
-                    Field {
-                        label: "Question".to_string(),
-                        ty: DeclarationId(2191),
-                    },
-                    Field {
-                        label: "Eof".to_string(),
-                        ty: DeclarationId(2192),
-                    },
-                ],
+            id: DeclarationId(1259),
+            name: Some("report_inhabits_branch_tm".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(1214), DeclarationId(1043)],
+                output: DeclarationId(2229),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(825))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40833,22 +41723,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/tokenize.dag", 627, 1220),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7030, 7281),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1245),
-            name: Some("Token".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "kind".to_string(),
-                        ty: DeclarationId(1244),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
+            id: DeclarationId(1260),
+            name: Some("dimension_report_tm_from_witness".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(2230)],
+                output: DeclarationId(2231),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(835))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40858,66 +41741,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/tokenize.dag", 1355, 1406),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7283, 7702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1246),
-            name: Some("KeywordTokenKind".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "KwLet".to_string(),
-                        ty: DeclarationId(2193),
-                    },
-                    Field {
-                        label: "KwIf".to_string(),
-                        ty: DeclarationId(2194),
-                    },
-                    Field {
-                        label: "KwThen".to_string(),
-                        ty: DeclarationId(2195),
-                    },
-                    Field {
-                        label: "KwElse".to_string(),
-                        ty: DeclarationId(2196),
-                    },
-                    Field {
-                        label: "KwFn".to_string(),
-                        ty: DeclarationId(2197),
-                    },
-                    Field {
-                        label: "KwType".to_string(),
-                        ty: DeclarationId(2198),
-                    },
-                    Field {
-                        label: "KwModule".to_string(),
-                        ty: DeclarationId(2199),
-                    },
-                    Field {
-                        label: "KwImport".to_string(),
-                        ty: DeclarationId(2200),
-                    },
-                    Field {
-                        label: "KwMatch".to_string(),
-                        ty: DeclarationId(2201),
-                    },
-                    Field {
-                        label: "KwData".to_string(),
-                        ty: DeclarationId(2202),
-                    },
-                    Field {
-                        label: "KwWhere".to_string(),
-                        ty: DeclarationId(2203),
-                    },
-                    Field {
-                        label: "KwTrue".to_string(),
-                        ty: DeclarationId(2204),
-                    },
-                    Field {
-                        label: "KwFalse".to_string(),
-                        ty: DeclarationId(2205),
-                    },
-                ],
+            id: DeclarationId(1261),
+            name: Some("demo_ci_modeled_timing_dimension_report".to_string()),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(827)],
+                output: DeclarationId(2232),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(843))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -40927,124 +41759,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/tokenize.dag", 1765, 1931),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8563, 8864),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1247),
-            name: Some("PunctTokenKind".to_string()),
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Eq".to_string(),
-                        ty: DeclarationId(2206),
-                    },
-                    Field {
-                        label: "EqEq".to_string(),
-                        ty: DeclarationId(2207),
-                    },
-                    Field {
-                        label: "NotEq".to_string(),
-                        ty: DeclarationId(2208),
-                    },
-                    Field {
-                        label: "Lt".to_string(),
-                        ty: DeclarationId(2209),
-                    },
-                    Field {
-                        label: "Le".to_string(),
-                        ty: DeclarationId(2210),
-                    },
-                    Field {
-                        label: "Gt".to_string(),
-                        ty: DeclarationId(2211),
-                    },
-                    Field {
-                        label: "Ge".to_string(),
-                        ty: DeclarationId(2212),
-                    },
-                    Field {
-                        label: "Plus".to_string(),
-                        ty: DeclarationId(2213),
-                    },
-                    Field {
-                        label: "Minus".to_string(),
-                        ty: DeclarationId(2214),
-                    },
-                    Field {
-                        label: "Star".to_string(),
-                        ty: DeclarationId(2215),
-                    },
-                    Field {
-                        label: "Slash".to_string(),
-                        ty: DeclarationId(2216),
-                    },
-                    Field {
-                        label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2217),
-                    },
-                    Field {
-                        label: "PipePipe".to_string(),
-                        ty: DeclarationId(2218),
-                    },
-                    Field {
-                        label: "Colon".to_string(),
-                        ty: DeclarationId(2219),
-                    },
-                    Field {
-                        label: "Arrow".to_string(),
-                        ty: DeclarationId(2220),
-                    },
-                    Field {
-                        label: "FatArrow".to_string(),
-                        ty: DeclarationId(2221),
-                    },
-                    Field {
-                        label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2222),
-                    },
-                    Field {
-                        label: "Dot".to_string(),
-                        ty: DeclarationId(2223),
-                    },
-                    Field {
-                        label: "LParen".to_string(),
-                        ty: DeclarationId(2224),
-                    },
-                    Field {
-                        label: "RParen".to_string(),
-                        ty: DeclarationId(2225),
-                    },
-                    Field {
-                        label: "LBrace".to_string(),
-                        ty: DeclarationId(2226),
-                    },
-                    Field {
-                        label: "RBrace".to_string(),
-                        ty: DeclarationId(2227),
-                    },
-                    Field {
-                        label: "LBracket".to_string(),
-                        ty: DeclarationId(2228),
-                    },
-                    Field {
-                        label: "RBracket".to_string(),
-                        ty: DeclarationId(2229),
-                    },
-                    Field {
-                        label: "Comma".to_string(),
-                        ty: DeclarationId(2230),
-                    },
-                    Field {
-                        label: "Semicolon".to_string(),
-                        ty: DeclarationId(2231),
-                    },
+            id: DeclarationId(1262),
+            name: Some("gate_58_ci_workflow_timing_row".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
                     Field {
-                        label: "Pipe".to_string(),
-                        ty: DeclarationId(2232),
+                        label: "workflow".to_string(),
+                        ty: DeclarationId(1374),
                     },
                     Field {
-                        label: "Question".to_string(),
-                        ty: DeclarationId(2233),
+                        label: "measurement".to_string(),
+                        ty: DeclarationId(1214),
                     },
                 ],
             },
@@ -41056,60 +41784,124 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2347, 2653),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 10052, 10145),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1248),
-            name: Some("LocalPunctSpec".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "pattern".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "kind".to_string(),
-                        ty: DeclarationId(1247),
-                    },
-                ],
+            id: DeclarationId(1263),
+            name: Some("gate_58_modeled_ci_timing_measurement".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1262),
+                arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(1262)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "workflow".to_string(),
+                        FieldValue::Reference(DeclarationId(1244)),
+                    ),
+                    (
+                        "measurement".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2192),
+                            payload: vec![FieldValue::Record(vec![(
+                                "count".to_string(),
+                                FieldValue::Literal(LiteralBits::Int("0".to_string())),
+                            )])],
+                        },
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2863, 2927),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 10147, 10316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1249),
-            name: Some("StringEscapeSpec".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "suffix".to_string(),
-                        ty: DeclarationId(230),
+            id: DeclarationId(1264),
+            name: Some("gate_58_apply_lens_self_application_pass".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1092),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1093),
+                        value: DeclarationId(1214),
                     },
-                    Field {
-                        label: "output_codepoint".to_string(),
-                        ty: DeclarationId(93),
+                    TemplateArgument {
+                        parameter: DeclarationId(1094),
+                        value: DeclarationId(1220),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1095),
+                        value: DeclarationId(1221),
                     },
                 ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: None,
+            meta_tag: Some(DeclarationId(2233)),
             specialization_parent: None,
             inhabits: None,
-            value_body: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "enforceable_lens".to_string(),
+                        FieldValue::Reference(DeclarationId(1243)),
+                    ),
+                    (
+                        "section".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2005),
+                            payload: vec![FieldValue::Reference(DeclarationId(1263))],
+                        },
+                    ),
+                    (
+                        "budget".to_string(),
+                        FieldValue::Record(vec![(
+                            "max".to_string(),
+                            FieldValue::Record(vec![(
+                                "count".to_string(),
+                                FieldValue::Literal(LiteralBits::Int("1000000000".to_string())),
+                            )]),
+                        )]),
+                    ),
+                    (
+                        "diagnostic_severity".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2007),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "span".to_string(),
+                        FieldValue::Record(vec![
+                            (
+                                "file".to_string(),
+                                FieldValue::Literal(LiteralBits::String(
+                                    "src/v3/std/t_ci_workflow_as_data_demo.dag".to_string(),
+                                )),
+                            ),
+                            (
+                                "start".to_string(),
+                                FieldValue::Literal(LiteralBits::Int("0".to_string())),
+                            ),
+                            (
+                                "end".to_string(),
+                                FieldValue::Literal(LiteralBits::Int("0".to_string())),
+                            ),
+                        ]),
+                    ),
+                ],
+            }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 3314, 3380),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 10576, 10981),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1250),
+            id: DeclarationId(1265),
             name: Some("Path".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(158),
@@ -41126,7 +41918,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 1402, 1422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1251),
+            id: DeclarationId(1266),
             name: Some("SnapshotRef".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(151),
@@ -41143,7 +41935,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 1423, 1453),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1252),
+            id: DeclarationId(1267),
             name: Some("CensusListConstant".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -41157,15 +41949,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 1660, 1686),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1253),
+            id: DeclarationId(1268),
             name: Some("expected_hand_authored_non_test".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1252),
+                template: DeclarationId(1267),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1252)),
+            meta_tag: Some(DeclarationId(1267)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -41174,15 +41966,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 1688, 1749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1254),
+            id: DeclarationId(1269),
             name: Some("expected_hand_authored_test".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1252),
+                template: DeclarationId(1267),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1252)),
+            meta_tag: Some(DeclarationId(1267)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -41191,7 +41983,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 1750, 1807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1255),
+            id: DeclarationId(1270),
             name: Some("LensProducerFilesSubsetPredicate".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -41205,15 +41997,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 1939, 1979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1256),
+            id: DeclarationId(1271),
             name: Some("lens_producer_files_subset_predicate".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1255),
+                template: DeclarationId(1270),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1255)),
+            meta_tag: Some(DeclarationId(1270)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -41222,7 +42014,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 1981, 2061),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1257),
+            id: DeclarationId(1272),
             name: Some("BinShimFilesSubsetPredicate".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -41236,15 +42028,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2168, 2203),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1258),
+            id: DeclarationId(1273),
             name: Some("bin_shim_files_subset_predicate".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1257),
+                template: DeclarationId(1272),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1257)),
+            meta_tag: Some(DeclarationId(1272)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -41253,7 +42045,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2205, 2275),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1259),
+            id: DeclarationId(1274),
             name: Some("CompilerStdPositiveSetRatchet".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -41267,15 +42059,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2354, 2391),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1260),
+            id: DeclarationId(1275),
             name: Some("compiler_std_positive_set_ratchet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1259),
+                template: DeclarationId(1274),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1259)),
+            meta_tag: Some(DeclarationId(1274)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -41284,49 +42076,49 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2393, 2467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1261),
+            id: DeclarationId(1276),
             name: Some("DiagnosticKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(2237),
+                        ty: DeclarationId(2258),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(2238),
+                        ty: DeclarationId(2259),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(2239),
+                        ty: DeclarationId(2260),
                     },
                     Field {
                         label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(2240),
+                        ty: DeclarationId(2261),
                     },
                     Field {
                         label: "ResolveError".to_string(),
-                        ty: DeclarationId(2241),
+                        ty: DeclarationId(2262),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(2242),
+                        ty: DeclarationId(2263),
                     },
                     Field {
                         label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(2243),
+                        ty: DeclarationId(2264),
                     },
                     Field {
                         label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(2244),
+                        ty: DeclarationId(2265),
                     },
                     Field {
                         label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(2245),
+                        ty: DeclarationId(2266),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2246),
+                        ty: DeclarationId(2267),
                     },
                 ],
             },
@@ -41341,17 +42133,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2802, 3033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1262),
+            id: DeclarationId(1277),
             name: Some("DiagnosticDetailExpectation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "AnyDetail".to_string(),
-                        ty: DeclarationId(2247),
+                        ty: DeclarationId(2268),
                     },
                     Field {
                         label: "Contains".to_string(),
-                        ty: DeclarationId(2248),
+                        ty: DeclarationId(2269),
                     },
                 ],
             },
@@ -41366,17 +42158,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 3402, 3469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1263),
+            id: DeclarationId(1278),
             name: Some("DiagnosticReference".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(1261),
+                        ty: DeclarationId(1276),
                     },
                     Field {
                         label: "detail_contains".to_string(),
-                        ty: DeclarationId(1262),
+                        ty: DeclarationId(1277),
                     },
                 ],
             },
@@ -41391,17 +42183,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 3613, 3711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1264),
+            id: DeclarationId(1279),
             name: Some("PortStateExpectation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(2249),
+                        ty: DeclarationId(2270),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(2250),
+                        ty: DeclarationId(2271),
                     },
                 ],
             },
@@ -41416,12 +42208,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4098, 4151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1265),
+            id: DeclarationId(1280),
             name: Some("PerfBudgetComparisonOp".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "AtMostBudget".to_string(),
-                    ty: DeclarationId(2251),
+                    ty: DeclarationId(2272),
                 }],
             },
             type_params: vec![],
@@ -41435,21 +42227,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4344, 4388),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1266),
+            id: DeclarationId(1281),
             name: Some("AlgebraicLawKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Associativity".to_string(),
-                        ty: DeclarationId(2252),
+                        ty: DeclarationId(2273),
                     },
                     Field {
                         label: "Commutativity".to_string(),
-                        ty: DeclarationId(2253),
+                        ty: DeclarationId(2274),
                     },
                     Field {
                         label: "Identity".to_string(),
-                        ty: DeclarationId(2254),
+                        ty: DeclarationId(2275),
                     },
                 ],
             },
@@ -41464,12 +42256,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5177, 5247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1267),
+            id: DeclarationId(1282),
             name: Some("ProgramGenerator".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "generator".to_string(),
-                    ty: DeclarationId(1300),
+                    ty: DeclarationId(1314),
                 }],
             },
             type_params: vec![],
@@ -41483,12 +42275,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5484, 5537),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1268),
+            id: DeclarationId(1283),
             name: Some("ProgramShape".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LiteralProgram".to_string(),
-                    ty: DeclarationId(2255),
+                    ty: DeclarationId(2276),
                 }],
             },
             type_params: vec![],
@@ -41502,12 +42294,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5770, 5859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1269),
+            id: DeclarationId(1284),
             name: Some("SymbolicCostBindParamExpected".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LinearCostForBindParam".to_string(),
-                    ty: DeclarationId(2256),
+                    ty: DeclarationId(2277),
                 }],
             },
             type_params: vec![],
@@ -41521,12 +42313,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5861, 5953),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1270),
+            id: DeclarationId(1285),
             name: Some("BindParamSizeVariable".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "SelectedBindParamSizeVariable".to_string(),
-                    ty: DeclarationId(2257),
+                    ty: DeclarationId(2278),
                 }],
             },
             type_params: vec![],
@@ -41540,7 +42332,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5955, 6015),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1271),
+            id: DeclarationId(1286),
             name: Some("BindParamRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -41559,17 +42351,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6017, 6051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1272),
+            id: DeclarationId(1287),
             name: Some("LensCapabilityStructuralStatus".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LensCapabilityStructuralTerminal".to_string(),
-                        ty: DeclarationId(2258),
+                        ty: DeclarationId(2279),
                     },
                     Field {
                         label: "LensCapabilityStructuralPartial".to_string(),
-                        ty: DeclarationId(2259),
+                        ty: DeclarationId(2280),
                     },
                 ],
             },
@@ -41584,25 +42376,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6577, 6685),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1273),
+            id: DeclarationId(1288),
             name: Some("LensCapabilityBehavioralStatus".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LensCapabilityBehavioralComplete".to_string(),
-                        ty: DeclarationId(2260),
+                        ty: DeclarationId(2281),
                     },
                     Field {
                         label: "LensCapabilityBehavioralPartial".to_string(),
-                        ty: DeclarationId(2261),
+                        ty: DeclarationId(2282),
                     },
                     Field {
                         label: "LensCapabilityBehavioralStub".to_string(),
-                        ty: DeclarationId(2262),
+                        ty: DeclarationId(2283),
                     },
                     Field {
                         label: "LensCapabilityBehavioralNA".to_string(),
-                        ty: DeclarationId(2263),
+                        ty: DeclarationId(2284),
                     },
                 ],
             },
@@ -41617,21 +42409,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6687, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1274),
+            id: DeclarationId(1289),
             name: Some("LensCapabilityV2Counterpart".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LensCapabilityV2RealV2".to_string(),
-                        ty: DeclarationId(2264),
+                        ty: DeclarationId(2285),
                     },
                     Field {
                         label: "LensCapabilityV2NoneV3Native".to_string(),
-                        ty: DeclarationId(2265),
+                        ty: DeclarationId(2286),
                     },
                     Field {
                         label: "LensCapabilityV2NotApplicable".to_string(),
-                        ty: DeclarationId(2266),
+                        ty: DeclarationId(2287),
                     },
                 ],
             },
@@ -41646,7 +42438,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6861, 6987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1275),
+            id: DeclarationId(1290),
             name: Some("LensCapabilityRegisterRow".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -41656,15 +42448,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "structural".to_string(),
-                        ty: DeclarationId(1272),
+                        ty: DeclarationId(1287),
                     },
                     Field {
                         label: "behavioral".to_string(),
-                        ty: DeclarationId(1273),
+                        ty: DeclarationId(1288),
                     },
                     Field {
                         label: "v2_counterpart".to_string(),
-                        ty: DeclarationId(1274),
+                        ty: DeclarationId(1289),
                     },
                 ],
             },
@@ -41679,18 +42471,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6989, 7183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1276),
+            id: DeclarationId(1291),
             name: Some("lens_capability_register_rows".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1275),
+                    value: DeclarationId(1290),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2306)),
+            meta_tag: Some(DeclarationId(2327)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -41702,21 +42494,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2258),
+                            constructor: DeclarationId(2279),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2260),
+                            constructor: DeclarationId(2281),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2264),
+                            constructor: DeclarationId(2285),
                             payload: vec![],
                         },
                     ),
@@ -41729,21 +42521,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2258),
+                            constructor: DeclarationId(2279),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2260),
+                            constructor: DeclarationId(2281),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2264),
+                            constructor: DeclarationId(2285),
                             payload: vec![],
                         },
                     ),
@@ -41758,21 +42550,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2258),
+                            constructor: DeclarationId(2279),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2263),
+                            constructor: DeclarationId(2284),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2265),
+                            constructor: DeclarationId(2286),
                             payload: vec![],
                         },
                     ),
@@ -41787,21 +42579,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2258),
+                            constructor: DeclarationId(2279),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2261),
+                            constructor: DeclarationId(2282),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2265),
+                            constructor: DeclarationId(2286),
                             payload: vec![],
                         },
                     ),
@@ -41814,21 +42606,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2258),
+                            constructor: DeclarationId(2279),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2260),
+                            constructor: DeclarationId(2281),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2265),
+                            constructor: DeclarationId(2286),
                             payload: vec![],
                         },
                     ),
@@ -41841,21 +42633,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2258),
+                            constructor: DeclarationId(2279),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2261),
+                            constructor: DeclarationId(2282),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2265),
+                            constructor: DeclarationId(2286),
                             payload: vec![],
                         },
                     ),
@@ -41868,21 +42660,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2258),
+                            constructor: DeclarationId(2279),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2260),
+                            constructor: DeclarationId(2281),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2265),
+                            constructor: DeclarationId(2286),
                             payload: vec![],
                         },
                     ),
@@ -41897,21 +42689,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2258),
+                            constructor: DeclarationId(2279),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2260),
+                            constructor: DeclarationId(2281),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2265),
+                            constructor: DeclarationId(2286),
                             payload: vec![],
                         },
                     ),
@@ -41924,21 +42716,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2258),
+                            constructor: DeclarationId(2279),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2260),
+                            constructor: DeclarationId(2281),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2265),
+                            constructor: DeclarationId(2286),
                             payload: vec![],
                         },
                     ),
@@ -41953,21 +42745,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2258),
+                            constructor: DeclarationId(2279),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2260),
+                            constructor: DeclarationId(2281),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2265),
+                            constructor: DeclarationId(2286),
                             payload: vec![],
                         },
                     ),
@@ -41980,21 +42772,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2259),
+                            constructor: DeclarationId(2280),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2263),
+                            constructor: DeclarationId(2284),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2266),
+                            constructor: DeclarationId(2287),
                             payload: vec![],
                         },
                     ),
@@ -42007,21 +42799,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2259),
+                            constructor: DeclarationId(2280),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2263),
+                            constructor: DeclarationId(2284),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2266),
+                            constructor: DeclarationId(2287),
                             payload: vec![],
                         },
                     ),
@@ -42036,21 +42828,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2258),
+                            constructor: DeclarationId(2279),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2263),
+                            constructor: DeclarationId(2284),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2266),
+                            constructor: DeclarationId(2287),
                             payload: vec![],
                         },
                     ),
@@ -42061,113 +42853,113 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 7185, 9772),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1277),
+            id: DeclarationId(1292),
             name: Some("TestPredicate".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Compiles".to_string(),
-                        ty: DeclarationId(2267),
+                        ty: DeclarationId(2288),
                     },
                     Field {
                         label: "FailsWithDiagnostic".to_string(),
-                        ty: DeclarationId(2268),
+                        ty: DeclarationId(2289),
                     },
                     Field {
                         label: "OutputEquals".to_string(),
-                        ty: DeclarationId(2269),
+                        ty: DeclarationId(2290),
                     },
                     Field {
                         label: "PortHasState".to_string(),
-                        ty: DeclarationId(2270),
+                        ty: DeclarationId(2291),
                     },
                     Field {
                         label: "DeclarationHasRefinement".to_string(),
-                        ty: DeclarationId(2271),
+                        ty: DeclarationId(2292),
                     },
                     Field {
                         label: "CostBounded".to_string(),
-                        ty: DeclarationId(2272),
+                        ty: DeclarationId(2293),
                     },
                     Field {
                         label: "BehavioralObservation".to_string(),
-                        ty: DeclarationId(2273),
+                        ty: DeclarationId(2294),
                     },
                     Field {
                         label: "MockBackedInvariant".to_string(),
-                        ty: DeclarationId(2274),
+                        ty: DeclarationId(2295),
                     },
                     Field {
                         label: "ExecuteCommand".to_string(),
-                        ty: DeclarationId(2276),
+                        ty: DeclarationId(2297),
                     },
                     Field {
                         label: "ForAllTargets".to_string(),
-                        ty: DeclarationId(2278),
+                        ty: DeclarationId(2299),
                     },
                     Field {
                         label: "LensOutputEquals".to_string(),
-                        ty: DeclarationId(2279),
+                        ty: DeclarationId(2300),
                     },
                     Field {
                         label: "DifferentialEquals".to_string(),
-                        ty: DeclarationId(2280),
+                        ty: DeclarationId(2301),
                     },
                     Field {
                         label: "SymbolicCostExprEquals".to_string(),
-                        ty: DeclarationId(2281),
+                        ty: DeclarationId(2302),
                     },
                     Field {
                         label: "SymbolicCostExprEqualsForBindParam".to_string(),
-                        ty: DeclarationId(2282),
+                        ty: DeclarationId(2303),
                     },
                     Field {
                         label: "PerfWithinBaseline".to_string(),
-                        ty: DeclarationId(2283),
+                        ty: DeclarationId(2304),
                     },
                     Field {
                         label: "BinaryDimensionReportEquals".to_string(),
-                        ty: DeclarationId(2284),
+                        ty: DeclarationId(2305),
                     },
                     Field {
                         label: "AlgebraicLaw".to_string(),
-                        ty: DeclarationId(2285),
+                        ty: DeclarationId(2306),
                     },
                     Field {
                         label: "CensusBoundCheck".to_string(),
-                        ty: DeclarationId(2286),
+                        ty: DeclarationId(2307),
                     },
                     Field {
                         label: "CensusSubsetCount".to_string(),
-                        ty: DeclarationId(2287),
+                        ty: DeclarationId(2308),
                     },
                     Field {
                         label: "FixedPointConverges".to_string(),
-                        ty: DeclarationId(2288),
+                        ty: DeclarationId(2309),
                     },
                     Field {
                         label: "RatchetZero".to_string(),
-                        ty: DeclarationId(2289),
+                        ty: DeclarationId(2310),
                     },
                     Field {
                         label: "GeneratedFromDag".to_string(),
-                        ty: DeclarationId(2291),
+                        ty: DeclarationId(2312),
                     },
                     Field {
                         label: "CementingDispatchMatchesProjection".to_string(),
-                        ty: DeclarationId(2292),
+                        ty: DeclarationId(2313),
                     },
                     Field {
                         label: "ReleaseDeferredClaim".to_string(),
-                        ty: DeclarationId(2293),
+                        ty: DeclarationId(2314),
                     },
                     Field {
                         label: "SubstrateResearchDeferredClaim".to_string(),
-                        ty: DeclarationId(2294),
+                        ty: DeclarationId(2315),
                     },
                     Field {
                         label: "BridgeLedgerZero".to_string(),
-                        ty: DeclarationId(2295),
+                        ty: DeclarationId(2316),
                     },
                 ],
             },
@@ -42182,7 +42974,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 9774, 22667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1278),
+            id: DeclarationId(1293),
             name: Some("ProgramInput".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -42196,12 +42988,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 22775, 22795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1279),
+            id: DeclarationId(1294),
             name: Some("ProgramOutputBind".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "output_ref".to_string(),
-                    ty: DeclarationId(1300),
+                    ty: DeclarationId(1314),
                 }],
             },
             type_params: vec![],
@@ -42215,7 +43007,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 22938, 22993),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1280),
+            id: DeclarationId(1295),
             name: Some("TestClaim".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -42233,11 +43025,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "predicate".to_string(),
-                        ty: DeclarationId(1277),
+                        ty: DeclarationId(1292),
                     },
                     Field {
                         label: "requires".to_string(),
-                        ty: DeclarationId(2296),
+                        ty: DeclarationId(2317),
                     },
                 ],
             },
@@ -42252,17 +43044,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 23603, 23736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1281),
+            id: DeclarationId(1296),
             name: Some("Quantifier".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ForAll".to_string(),
-                        ty: DeclarationId(2297),
+                        ty: DeclarationId(2318),
                     },
                     Field {
                         label: "Exists".to_string(),
-                        ty: DeclarationId(2298),
+                        ty: DeclarationId(2319),
                     },
                 ],
             },
@@ -42277,7 +43069,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 23917, 23954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1282),
+            id: DeclarationId(1297),
             name: Some("QuantifiedTestClaim".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -42287,19 +43079,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "generator".to_string(),
-                        ty: DeclarationId(1267),
+                        ty: DeclarationId(1282),
                     },
                     Field {
                         label: "quantifier".to_string(),
-                        ty: DeclarationId(1281),
+                        ty: DeclarationId(1296),
                     },
                     Field {
                         label: "predicate".to_string(),
-                        ty: DeclarationId(1277),
+                        ty: DeclarationId(1292),
                     },
                     Field {
                         label: "requires".to_string(),
-                        ty: DeclarationId(2299),
+                        ty: DeclarationId(2320),
                     },
                 ],
             },
@@ -42314,17 +43106,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 23956, 24117),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1283),
+            id: DeclarationId(1298),
             name: Some("TestNodeRef".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "EnumeratedTestNode".to_string(),
-                        ty: DeclarationId(2300),
+                        ty: DeclarationId(2321),
                     },
                     Field {
                         label: "QuantifiedTestNode".to_string(),
-                        ty: DeclarationId(2301),
+                        ty: DeclarationId(2322),
                     },
                 ],
             },
@@ -42339,21 +43131,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 25817, 25911),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1284),
+            id: DeclarationId(1299),
             name: Some("TestNodeCostDimension".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "node".to_string(),
-                        ty: DeclarationId(1283),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "budget".to_string(),
-                        ty: DeclarationId(1228),
+                        ty: DeclarationId(1220),
                     },
                     Field {
                         label: "measured".to_string(),
-                        ty: DeclarationId(1222),
+                        ty: DeclarationId(1214),
                     },
                 ],
             },
@@ -42368,17 +43160,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 25913, 26016),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1285),
+            id: DeclarationId(1300),
             name: Some("SuiteClaim".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Enumerated".to_string(),
-                        ty: DeclarationId(2302),
+                        ty: DeclarationId(2323),
                     },
                     Field {
                         label: "Quantified".to_string(),
-                        ty: DeclarationId(2303),
+                        ty: DeclarationId(2324),
                     },
                 ],
             },
@@ -42393,7 +43185,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 26749, 26826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1286),
+            id: DeclarationId(1301),
             name: Some("TestSuite".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -42403,7 +43195,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "claims".to_string(),
-                        ty: DeclarationId(2304),
+                        ty: DeclarationId(2325),
                     },
                 ],
             },
@@ -42418,7 +43210,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 26828, 26888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1287),
+            id: DeclarationId(1302),
             name: Some("TestObligation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -42428,7 +43220,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "resources".to_string(),
-                        ty: DeclarationId(2305),
+                        ty: DeclarationId(2326),
                     },
                 ],
             },
@@ -42443,11 +43235,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 27086, 27167),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1288),
+            id: DeclarationId(1303),
             name: Some("claim_obligation_resources".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1280)],
-                output: DeclarationId(2234),
+                inputs: vec![DeclarationId(1295)],
+                output: DeclarationId(2255),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     27609,
@@ -42465,11 +43257,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 27538, 27625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1289),
+            id: DeclarationId(1304),
             name: Some("obligation_for_claim".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1280)],
-                output: DeclarationId(1287),
+                inputs: vec![DeclarationId(1295)],
+                output: DeclarationId(1302),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     27683,
@@ -42487,11 +43279,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 27627, 27768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1290),
+            id: DeclarationId(1305),
             name: Some("obligation_for_quantified_claim".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1282)],
-                output: DeclarationId(1287),
+                inputs: vec![DeclarationId(1297)],
+                output: DeclarationId(1302),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     28075,
@@ -42509,12 +43301,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 27998, 28141),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1291),
+            id: DeclarationId(1306),
             name: Some("obligation_for_suite_claim".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1285)],
-                output: DeclarationId(1287),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(813))),
+                inputs: vec![DeclarationId(1300)],
+                output: DeclarationId(1302),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(847))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -42527,11 +43319,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 28446, 28635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1292),
+            id: DeclarationId(1307),
             name: Some("materialize_test_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2235)],
-                output: DeclarationId(2236),
+                inputs: vec![DeclarationId(2256)],
+                output: DeclarationId(2257),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     28719,
@@ -42549,25 +43341,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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(2307),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(815))),
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/workflows.dag", 963, 1018),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1294),
+            id: DeclarationId(1308),
             name: Some("ValueBehavior".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -42581,7 +43355,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(1295),
+            id: DeclarationId(1309),
             name: Some("Transform".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -42595,7 +43369,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(1296),
+            id: DeclarationId(1310),
             name: Some("Branch".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -42609,7 +43383,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(1297),
+            id: DeclarationId(1311),
             name: Some("Loop".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -42623,7 +43397,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(1298),
+            id: DeclarationId(1312),
             name: Some("Bind".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -42637,7 +43411,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(1299),
+            id: DeclarationId(1313),
             name: Some("Main".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -42651,7 +43425,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(1300),
+            id: DeclarationId(1314),
             name: Some("DeclarationRef".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -42665,7 +43439,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(1301),
+            id: DeclarationId(1315),
             name: Some("CompilerHostRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -42684,21 +43458,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(1302),
+            id: DeclarationId(1316),
             name: Some("PipelineSnapshotKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "SnapshotSurface".to_string(),
-                        ty: DeclarationId(2308),
+                        ty: DeclarationId(2328),
                     },
                     Field {
                         label: "SnapshotDag".to_string(),
-                        ty: DeclarationId(2309),
+                        ty: DeclarationId(2329),
                     },
                     Field {
                         label: "SnapshotText".to_string(),
-                        ty: DeclarationId(2310),
+                        ty: DeclarationId(2330),
                     },
                 ],
             },
@@ -42713,21 +43487,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(1303),
+            id: DeclarationId(1317),
             name: Some("PipelineStageBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "stage".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                     Field {
                         label: "realization".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                     Field {
                         label: "snapshot".to_string(),
-                        ty: DeclarationId(1302),
+                        ty: DeclarationId(1316),
                     },
                 ],
             },
@@ -42742,7 +43516,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(1304),
+            id: DeclarationId(1318),
             name: Some("parse_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -42752,7 +43526,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1301)),
+            meta_tag: Some(DeclarationId(1315)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -42766,7 +43540,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(1305),
+            id: DeclarationId(1319),
             name: Some("lower_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -42776,7 +43550,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1301)),
+            meta_tag: Some(DeclarationId(1315)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -42790,7 +43564,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(1306),
+            id: DeclarationId(1320),
             name: Some("infer_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -42800,7 +43574,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1301)),
+            meta_tag: Some(DeclarationId(1315)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -42814,7 +43588,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(1307),
+            id: DeclarationId(1321),
             name: Some("compute_ownership_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -42824,7 +43598,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1301)),
+            meta_tag: Some(DeclarationId(1315)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -42840,7 +43614,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(1308),
+            id: DeclarationId(1322),
             name: Some("emit_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -42850,7 +43624,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1301)),
+            meta_tag: Some(DeclarationId(1315)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -42864,7 +43638,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(1309),
+            id: DeclarationId(1323),
             name: Some("lens_complexity_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -42874,7 +43648,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1301)),
+            meta_tag: Some(DeclarationId(1315)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -42890,31 +43664,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(1310),
+            id: DeclarationId(1324),
             name: Some("parse_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1303),
+                template: DeclarationId(1317),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1303)),
+            meta_tag: Some(DeclarationId(1317)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1316)),
+                        FieldValue::Reference(DeclarationId(1330)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1304)),
+                        FieldValue::Reference(DeclarationId(1318)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2308),
+                            constructor: DeclarationId(2328),
                             payload: vec![],
                         },
                     ),
@@ -42925,31 +43699,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(1311),
+            id: DeclarationId(1325),
             name: Some("lower_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1303),
+                template: DeclarationId(1317),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1303)),
+            meta_tag: Some(DeclarationId(1317)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1317)),
+                        FieldValue::Reference(DeclarationId(1331)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1305)),
+                        FieldValue::Reference(DeclarationId(1319)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2309),
+                            constructor: DeclarationId(2329),
                             payload: vec![],
                         },
                     ),
@@ -42960,31 +43734,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(1312),
+            id: DeclarationId(1326),
             name: Some("infer_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1303),
+                template: DeclarationId(1317),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1303)),
+            meta_tag: Some(DeclarationId(1317)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1318)),
+                        FieldValue::Reference(DeclarationId(1332)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1306)),
+                        FieldValue::Reference(DeclarationId(1320)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2309),
+                            constructor: DeclarationId(2329),
                             payload: vec![],
                         },
                     ),
@@ -42995,31 +43769,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(1313),
+            id: DeclarationId(1327),
             name: Some("compute_ownership_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1303),
+                template: DeclarationId(1317),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1303)),
+            meta_tag: Some(DeclarationId(1317)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1319)),
+                        FieldValue::Reference(DeclarationId(1333)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1307)),
+                        FieldValue::Reference(DeclarationId(1321)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2309),
+                            constructor: DeclarationId(2329),
                             payload: vec![],
                         },
                     ),
@@ -43030,31 +43804,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(1314),
+            id: DeclarationId(1328),
             name: Some("lens_complexity_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1303),
+                template: DeclarationId(1317),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1303)),
+            meta_tag: Some(DeclarationId(1317)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1320)),
+                        FieldValue::Reference(DeclarationId(1334)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1309)),
+                        FieldValue::Reference(DeclarationId(1323)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2309),
+                            constructor: DeclarationId(2329),
                             payload: vec![],
                         },
                     ),
@@ -43065,31 +43839,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(1315),
+            id: DeclarationId(1329),
             name: Some("emit_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1303),
+                template: DeclarationId(1317),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1303)),
+            meta_tag: Some(DeclarationId(1317)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1321)),
+                        FieldValue::Reference(DeclarationId(1335)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1308)),
+                        FieldValue::Reference(DeclarationId(1322)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2310),
+                            constructor: DeclarationId(2330),
                             payload: vec![],
                         },
                     ),
@@ -43100,12 +43874,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(1316),
+            id: DeclarationId(1330),
             name: Some("parse".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230), DeclarationId(230)],
                 output: DeclarationId(828),
-                body: ArrowBody::ExternalRealization(DeclarationId(1304)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1318)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -43118,12 +43892,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(1317),
+            id: DeclarationId(1331),
             name: Some("lower".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828)],
                 output: DeclarationId(828),
-                body: ArrowBody::ExternalRealization(DeclarationId(1305)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1319)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -43136,12 +43910,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(1318),
+            id: DeclarationId(1332),
             name: Some("infer".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828)],
                 output: DeclarationId(828),
-                body: ArrowBody::ExternalRealization(DeclarationId(1306)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1320)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -43154,12 +43928,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(1319),
+            id: DeclarationId(1333),
             name: Some("compute_ownership".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828)],
                 output: DeclarationId(828),
-                body: ArrowBody::ExternalRealization(DeclarationId(1307)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1321)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -43172,12 +43946,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(1320),
+            id: DeclarationId(1334),
             name: Some("lens_complexity".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828)],
                 output: DeclarationId(828),
-                body: ArrowBody::ExternalRealization(DeclarationId(1309)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1323)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -43190,17 +43964,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2290, 2347),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1321),
+            id: DeclarationId(1335),
             name: Some("emit".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
                     DeclarationId(828),
                     DeclarationId(828),
                     DeclarationId(828),
-                    DeclarationId(1051),
+                    DeclarationId(1008),
                 ],
                 output: DeclarationId(230),
-                body: ArrowBody::ExternalRealization(DeclarationId(1308)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1322)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -43213,10 +43987,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2349, 2460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1322),
+            id: DeclarationId(1336),
             name: Some("compile".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(230), DeclarationId(230), DeclarationId(1051)],
+                inputs: vec![DeclarationId(230), DeclarationId(230), DeclarationId(1008)],
                 output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/pipeline.dag",
@@ -43235,11 +44009,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(1323),
+            id: DeclarationId(1337),
             name: Some("from_symbol".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
-                output: DeclarationId(2311),
+                output: DeclarationId(2331),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/operators.dag",
                     156,
@@ -43257,12 +44031,12 @@ 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(1324),
+            id: DeclarationId(1338),
             name: Some("symbol".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(806)],
                 output: DeclarationId(230),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(832))),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(864))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -43275,12 +44049,12 @@ 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(1325),
+            id: DeclarationId(1339),
             name: Some("algebra_field_name".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(806)],
                 output: DeclarationId(230),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(849))),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(881))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -43293,7 +44067,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(1326),
+            id: DeclarationId(1340),
             name: Some("LensRegistryEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -43322,15 +44096,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(1327),
+            id: DeclarationId(1341),
             name: Some("lens_cost_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1326),
+                template: DeclarationId(1340),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1326)),
+            meta_tag: Some(DeclarationId(1340)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43358,15 +44132,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(1328),
+            id: DeclarationId(1342),
             name: Some("lens_cost_symbolic_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1326),
+                template: DeclarationId(1340),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1326)),
+            meta_tag: Some(DeclarationId(1340)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43394,15 +44168,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(1329),
+            id: DeclarationId(1343),
             name: Some("lens_cost_target_realization_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1326),
+                template: DeclarationId(1340),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1326)),
+            meta_tag: Some(DeclarationId(1340)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43433,15 +44207,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(1330),
+            id: DeclarationId(1344),
             name: Some("lens_effect_enumeration_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1326),
+                template: DeclarationId(1340),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1326)),
+            meta_tag: Some(DeclarationId(1340)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43469,15 +44243,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(1331),
+            id: DeclarationId(1345),
             name: Some("lens_parallelism_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1326),
+                template: DeclarationId(1340),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1326)),
+            meta_tag: Some(DeclarationId(1340)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43505,15 +44279,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(1332),
+            id: DeclarationId(1346),
             name: Some("lens_provenance_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1326),
+                template: DeclarationId(1340),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1326)),
+            meta_tag: Some(DeclarationId(1340)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43541,15 +44315,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(1333),
+            id: DeclarationId(1347),
             name: Some("lens_structural_resolution_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1326),
+                template: DeclarationId(1340),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1326)),
+            meta_tag: Some(DeclarationId(1340)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43580,15 +44354,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(1334),
+            id: DeclarationId(1348),
             name: Some("lens_unused_parameters_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1326),
+                template: DeclarationId(1340),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1326)),
+            meta_tag: Some(DeclarationId(1340)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43616,15 +44390,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(1335),
+            id: DeclarationId(1349),
             name: Some("lens_infer_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1326),
+                template: DeclarationId(1340),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1326)),
+            meta_tag: Some(DeclarationId(1340)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43652,15 +44426,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(1336),
+            id: DeclarationId(1350),
             name: Some("lens_variant_payload_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1326),
+                template: DeclarationId(1340),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1326)),
+            meta_tag: Some(DeclarationId(1340)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43688,15 +44462,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(1337),
+            id: DeclarationId(1351),
             name: Some("lens_lower_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1326),
+                template: DeclarationId(1340),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1326)),
+            meta_tag: Some(DeclarationId(1340)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43724,17 +44498,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(1338),
+            id: DeclarationId(1352),
             name: Some("IntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OrderedRingAlgebra".to_string(),
-                        ty: DeclarationId(2312),
+                        ty: DeclarationId(2332),
                     },
                     Field {
                         label: "SemiringAlgebra".to_string(),
-                        ty: DeclarationId(2313),
+                        ty: DeclarationId(2333),
                     },
                 ],
             },
@@ -43749,21 +44523,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(1339),
+            id: DeclarationId(1353),
             name: Some("NonIntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ApproximateFieldAlgebra".to_string(),
-                        ty: DeclarationId(2314),
+                        ty: DeclarationId(2334),
                     },
                     Field {
                         label: "BooleanAlgebraAlgebra".to_string(),
-                        ty: DeclarationId(2315),
+                        ty: DeclarationId(2335),
                     },
                     Field {
                         label: "TerminalAlgebra".to_string(),
-                        ty: DeclarationId(2316),
+                        ty: DeclarationId(2336),
                     },
                 ],
             },
@@ -43778,37 +44552,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(1340),
+            id: DeclarationId(1354),
             name: Some("TargetCarrier".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BitCarrier".to_string(),
-                        ty: DeclarationId(2317),
+                        ty: DeclarationId(2337),
                     },
                     Field {
                         label: "ByteCarrier".to_string(),
-                        ty: DeclarationId(2318),
+                        ty: DeclarationId(2338),
                     },
                     Field {
                         label: "Word16Carrier".to_string(),
-                        ty: DeclarationId(2319),
+                        ty: DeclarationId(2339),
                     },
                     Field {
                         label: "Word32Carrier".to_string(),
-                        ty: DeclarationId(2320),
+                        ty: DeclarationId(2340),
                     },
                     Field {
                         label: "Word64Carrier".to_string(),
-                        ty: DeclarationId(2321),
+                        ty: DeclarationId(2341),
                     },
                     Field {
                         label: "Word128Carrier".to_string(),
-                        ty: DeclarationId(2322),
+                        ty: DeclarationId(2342),
                     },
                     Field {
                         label: "TerminalCarrier".to_string(),
-                        ty: DeclarationId(2323),
+                        ty: DeclarationId(2343),
                     },
                 ],
             },
@@ -43823,21 +44597,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(1341),
+            id: DeclarationId(1355),
             name: Some("IntegerOverflow".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TwoComplementWrap".to_string(),
-                        ty: DeclarationId(2324),
+                        ty: DeclarationId(2344),
                     },
                     Field {
                         label: "Saturating".to_string(),
-                        ty: DeclarationId(2325),
+                        ty: DeclarationId(2345),
                     },
                     Field {
                         label: "Trap".to_string(),
-                        ty: DeclarationId(2326),
+                        ty: DeclarationId(2346),
                     },
                 ],
             },
@@ -43852,17 +44626,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(1342),
+            id: DeclarationId(1356),
             name: Some("RustPrimitive".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IntegerPrimitive".to_string(),
-                        ty: DeclarationId(2327),
+                        ty: DeclarationId(2347),
                     },
                     Field {
                         label: "NonIntegerPrimitive".to_string(),
-                        ty: DeclarationId(2328),
+                        ty: DeclarationId(2348),
                     },
                 ],
             },
@@ -43877,94 +44651,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(1343),
+            id: DeclarationId(1357),
             name: Some("rust_pilot_primitives".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1342),
+                    value: DeclarationId(1356),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2329)),
+            meta_tag: Some(DeclarationId(2349)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
                 FieldValue::Variant {
-                    constructor: DeclarationId(2327),
+                    constructor: DeclarationId(2347),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2312),
+                            constructor: DeclarationId(2332),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2318),
+                            constructor: DeclarationId(2338),
                             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(2324),
+                            constructor: DeclarationId(2344),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2327),
+                    constructor: DeclarationId(2347),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2312),
+                            constructor: DeclarationId(2332),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2319),
+                            constructor: DeclarationId(2339),
                             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(2324),
+                            constructor: DeclarationId(2344),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2327),
+                    constructor: DeclarationId(2347),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2312),
+                            constructor: DeclarationId(2332),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2320),
+                            constructor: DeclarationId(2340),
                             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(2324),
+                            constructor: DeclarationId(2344),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2327),
+                    constructor: DeclarationId(2347),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2312),
+                            constructor: DeclarationId(2332),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2321),
+                            constructor: DeclarationId(2341),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -43973,21 +44747,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(2324),
+                            constructor: DeclarationId(2344),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2327),
+                    constructor: DeclarationId(2347),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2312),
+                            constructor: DeclarationId(2332),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2322),
+                            constructor: DeclarationId(2342),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -43998,84 +44772,84 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2324),
+                            constructor: DeclarationId(2344),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2327),
+                    constructor: DeclarationId(2347),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2313),
+                            constructor: DeclarationId(2333),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2318),
+                            constructor: DeclarationId(2338),
                             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(2324),
+                            constructor: DeclarationId(2344),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2327),
+                    constructor: DeclarationId(2347),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2313),
+                            constructor: DeclarationId(2333),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2319),
+                            constructor: DeclarationId(2339),
                             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(2324),
+                            constructor: DeclarationId(2344),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2327),
+                    constructor: DeclarationId(2347),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2313),
+                            constructor: DeclarationId(2333),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2320),
+                            constructor: DeclarationId(2340),
                             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(2324),
+                            constructor: DeclarationId(2344),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2327),
+                    constructor: DeclarationId(2347),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2313),
+                            constructor: DeclarationId(2333),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2321),
+                            constructor: DeclarationId(2341),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -44084,21 +44858,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2324),
+                            constructor: DeclarationId(2344),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2327),
+                    constructor: DeclarationId(2347),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2313),
+                            constructor: DeclarationId(2333),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2322),
+                            constructor: DeclarationId(2342),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -44107,66 +44881,66 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2324),
+                            constructor: DeclarationId(2344),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2328),
+                    constructor: DeclarationId(2348),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("f32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2314),
+                            constructor: DeclarationId(2334),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2320),
+                            constructor: DeclarationId(2340),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2328),
+                    constructor: DeclarationId(2348),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("f64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2314),
+                            constructor: DeclarationId(2334),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2321),
+                            constructor: DeclarationId(2341),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2328),
+                    constructor: DeclarationId(2348),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("bool".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2315),
+                            constructor: DeclarationId(2335),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2317),
+                            constructor: DeclarationId(2337),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2328),
+                    constructor: DeclarationId(2348),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("()".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2316),
+                            constructor: DeclarationId(2336),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2323),
+                            constructor: DeclarationId(2343),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
@@ -44178,29 +44952,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(1344),
+            id: DeclarationId(1358),
             name: Some("CronField".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Wildcard".to_string(),
-                        ty: DeclarationId(2330),
+                        ty: DeclarationId(2350),
                     },
                     Field {
                         label: "Exact".to_string(),
-                        ty: DeclarationId(2331),
+                        ty: DeclarationId(2351),
                     },
                     Field {
                         label: "Listed".to_string(),
-                        ty: DeclarationId(2333),
+                        ty: DeclarationId(2353),
                     },
                     Field {
                         label: "Ranged".to_string(),
-                        ty: DeclarationId(2334),
+                        ty: DeclarationId(2354),
                     },
                     Field {
                         label: "Step".to_string(),
-                        ty: DeclarationId(2335),
+                        ty: DeclarationId(2355),
                     },
                 ],
             },
@@ -44215,29 +44989,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(1345),
+            id: DeclarationId(1359),
             name: Some("CronSchedule".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "minute".to_string(),
-                        ty: DeclarationId(1344),
+                        ty: DeclarationId(1358),
                     },
                     Field {
                         label: "hour".to_string(),
-                        ty: DeclarationId(1344),
+                        ty: DeclarationId(1358),
                     },
                     Field {
                         label: "day_of_month".to_string(),
-                        ty: DeclarationId(1344),
+                        ty: DeclarationId(1358),
                     },
                     Field {
                         label: "month".to_string(),
-                        ty: DeclarationId(1344),
+                        ty: DeclarationId(1358),
                     },
                     Field {
                         label: "day_of_week".to_string(),
-                        ty: DeclarationId(1344),
+                        ty: DeclarationId(1358),
                     },
                 ],
             },
@@ -44252,7 +45026,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(1346),
+            id: DeclarationId(1360),
             name: Some("CronEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44262,7 +45036,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "schedule".to_string(),
-                        ty: DeclarationId(1345),
+                        ty: DeclarationId(1359),
                     },
                     Field {
                         label: "command".to_string(),
@@ -44281,10 +45055,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(1347),
+            id: DeclarationId(1361),
             name: Some("render_cron_field".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1344)],
+                inputs: vec![DeclarationId(1358)],
                 output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "dsl/extdeps/cron_schedule_model.dag",
@@ -44303,10 +45077,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(1348),
+            id: DeclarationId(1362),
             name: Some("render_cron_schedule".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1345)],
+                inputs: vec![DeclarationId(1359)],
                 output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "dsl/extdeps/cron_schedule_model.dag",
@@ -44325,7 +45099,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(1349),
+            id: DeclarationId(1363),
             name: Some("wire_contract".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(312),
@@ -44346,21 +45120,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(1350),
+            id: DeclarationId(1364),
             name: Some("UserType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "User".to_string(),
-                        ty: DeclarationId(2336),
+                        ty: DeclarationId(2356),
                     },
                     Field {
                         label: "Bot".to_string(),
-                        ty: DeclarationId(2337),
+                        ty: DeclarationId(2357),
                     },
                     Field {
                         label: "Organization".to_string(),
-                        ty: DeclarationId(2338),
+                        ty: DeclarationId(2358),
                     },
                 ],
             },
@@ -44375,7 +45149,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(1351),
+            id: DeclarationId(1365),
             name: Some("GitHubUser".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44389,7 +45163,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "type".to_string(),
-                        ty: DeclarationId(1350),
+                        ty: DeclarationId(1364),
                     },
                 ],
             },
@@ -44404,7 +45178,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(1352),
+            id: DeclarationId(1366),
             name: Some("Repository".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44441,7 +45215,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(1353),
+            id: DeclarationId(1367),
             name: Some("GitHubAuthToken".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44451,11 +45225,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "scopes".to_string(),
-                        ty: DeclarationId(2339),
+                        ty: DeclarationId(2359),
                     },
                     Field {
                         label: "expires_at".to_string(),
-                        ty: DeclarationId(2340),
+                        ty: DeclarationId(2360),
                     },
                 ],
             },
@@ -44470,29 +45244,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(1354),
+            id: DeclarationId(1368),
             name: Some("GitHubScope".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ScopeRepo".to_string(),
-                        ty: DeclarationId(2341),
+                        ty: DeclarationId(2361),
                     },
                     Field {
                         label: "ScopeGist".to_string(),
-                        ty: DeclarationId(2342),
+                        ty: DeclarationId(2362),
                     },
                     Field {
                         label: "ScopeWorkflow".to_string(),
-                        ty: DeclarationId(2343),
+                        ty: DeclarationId(2363),
                     },
                     Field {
                         label: "ScopeReadOrg".to_string(),
-                        ty: DeclarationId(2344),
+                        ty: DeclarationId(2364),
                     },
                     Field {
                         label: "ScopeReadUser".to_string(),
-                        ty: DeclarationId(2345),
+                        ty: DeclarationId(2365),
                     },
                 ],
             },
@@ -44507,7 +45281,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(1355),
+            id: DeclarationId(1369),
             name: Some("Pagination".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44517,7 +45291,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "cursor".to_string(),
-                        ty: DeclarationId(2346),
+                        ty: DeclarationId(2366),
                     },
                     Field {
                         label: "has_next".to_string(),
@@ -44536,21 +45310,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(1356),
+            id: DeclarationId(1370),
             name: Some("GitHubPermission".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PermRead".to_string(),
-                        ty: DeclarationId(2347),
+                        ty: DeclarationId(2367),
                     },
                     Field {
                         label: "PermWrite".to_string(),
-                        ty: DeclarationId(2348),
+                        ty: DeclarationId(2368),
                     },
                     Field {
                         label: "PermAdmin".to_string(),
-                        ty: DeclarationId(2349),
+                        ty: DeclarationId(2369),
                     },
                 ],
             },
@@ -44565,7 +45339,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(1357),
+            id: DeclarationId(1371),
             name: Some("default_api_base".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -44584,7 +45358,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(1358),
+            id: DeclarationId(1372),
             name: Some("default_per_page".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -44601,7 +45375,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(1359),
+            id: DeclarationId(1373),
             name: Some("max_per_page".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -44618,7 +45392,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(1360),
+            id: DeclarationId(1374),
             name: Some("Workflow".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44628,23 +45402,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "on".to_string(),
-                        ty: DeclarationId(2350),
+                        ty: DeclarationId(2370),
                     },
                     Field {
                         label: "concurrency".to_string(),
-                        ty: DeclarationId(2351),
+                        ty: DeclarationId(2371),
                     },
                     Field {
                         label: "jobs".to_string(),
-                        ty: DeclarationId(2352),
+                        ty: DeclarationId(2372),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2354),
+                        ty: DeclarationId(2374),
                     },
                     Field {
                         label: "permissions".to_string(),
-                        ty: DeclarationId(2355),
+                        ty: DeclarationId(2375),
                     },
                 ],
             },
@@ -44659,25 +45433,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(1361),
+            id: DeclarationId(1375),
             name: Some("WorkflowPermissions".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "contents".to_string(),
-                        ty: DeclarationId(1362),
+                        ty: DeclarationId(1376),
                     },
                     Field {
                         label: "pull_requests".to_string(),
-                        ty: DeclarationId(1362),
+                        ty: DeclarationId(1376),
                     },
                     Field {
                         label: "issues".to_string(),
-                        ty: DeclarationId(1362),
+                        ty: DeclarationId(1376),
                     },
                     Field {
                         label: "actions".to_string(),
-                        ty: DeclarationId(1362),
+                        ty: DeclarationId(1376),
                     },
                 ],
             },
@@ -44692,21 +45466,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(1362),
+            id: DeclarationId(1376),
             name: Some("PermissionLevel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PermRead".to_string(),
-                        ty: DeclarationId(2356),
+                        ty: DeclarationId(2376),
                     },
                     Field {
                         label: "PermWrite".to_string(),
-                        ty: DeclarationId(2357),
+                        ty: DeclarationId(2377),
                     },
                     Field {
                         label: "PermNone".to_string(),
-                        ty: DeclarationId(2358),
+                        ty: DeclarationId(2378),
                     },
                 ],
             },
@@ -44721,29 +45495,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(1363),
+            id: DeclarationId(1377),
             name: Some("WorkflowTrigger".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Push".to_string(),
-                        ty: DeclarationId(2361),
+                        ty: DeclarationId(2381),
                     },
                     Field {
                         label: "PullRequest".to_string(),
-                        ty: DeclarationId(2364),
+                        ty: DeclarationId(2384),
                     },
                     Field {
                         label: "Schedule".to_string(),
-                        ty: DeclarationId(2365),
+                        ty: DeclarationId(2385),
                     },
                     Field {
                         label: "WorkflowDispatch".to_string(),
-                        ty: DeclarationId(2367),
+                        ty: DeclarationId(2387),
                     },
                     Field {
                         label: "WorkflowCall".to_string(),
-                        ty: DeclarationId(2369),
+                        ty: DeclarationId(2389),
                     },
                 ],
             },
@@ -44758,29 +45532,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(1364),
+            id: DeclarationId(1378),
             name: Some("PullRequestActivity".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Opened".to_string(),
-                        ty: DeclarationId(2370),
+                        ty: DeclarationId(2390),
                     },
                     Field {
                         label: "Synchronize".to_string(),
-                        ty: DeclarationId(2371),
+                        ty: DeclarationId(2391),
                     },
                     Field {
                         label: "Reopened".to_string(),
-                        ty: DeclarationId(2372),
+                        ty: DeclarationId(2392),
                     },
                     Field {
                         label: "ReadyForReview".to_string(),
-                        ty: DeclarationId(2373),
+                        ty: DeclarationId(2393),
                     },
                     Field {
                         label: "Closed".to_string(),
-                        ty: DeclarationId(2374),
+                        ty: DeclarationId(2394),
                     },
                 ],
             },
@@ -44795,7 +45569,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(1365),
+            id: DeclarationId(1379),
             name: Some("DispatchInput".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44805,7 +45579,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "description".to_string(),
-                        ty: DeclarationId(2375),
+                        ty: DeclarationId(2395),
                     },
                     Field {
                         label: "required".to_string(),
@@ -44813,11 +45587,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "default".to_string(),
-                        ty: DeclarationId(2376),
+                        ty: DeclarationId(2396),
                     },
                     Field {
                         label: "type".to_string(),
-                        ty: DeclarationId(1366),
+                        ty: DeclarationId(1380),
                     },
                 ],
             },
@@ -44832,25 +45606,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(1366),
+            id: DeclarationId(1380),
             name: Some("DispatchInputType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "InputString".to_string(),
-                        ty: DeclarationId(2377),
+                        ty: DeclarationId(2397),
                     },
                     Field {
                         label: "InputBoolean".to_string(),
-                        ty: DeclarationId(2378),
+                        ty: DeclarationId(2398),
                     },
                     Field {
                         label: "InputChoice".to_string(),
-                        ty: DeclarationId(2379),
+                        ty: DeclarationId(2399),
                     },
                     Field {
                         label: "InputEnvironment".to_string(),
-                        ty: DeclarationId(2380),
+                        ty: DeclarationId(2400),
                     },
                 ],
             },
@@ -44865,21 +45639,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(1367),
+            id: DeclarationId(1381),
             name: Some("SecretScope".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "StepScope".to_string(),
-                        ty: DeclarationId(2381),
+                        ty: DeclarationId(2401),
                     },
                     Field {
                         label: "JobScope".to_string(),
-                        ty: DeclarationId(2382),
+                        ty: DeclarationId(2402),
                     },
                     Field {
                         label: "WorkflowScope".to_string(),
-                        ty: DeclarationId(2383),
+                        ty: DeclarationId(2403),
                     },
                 ],
             },
@@ -44894,7 +45668,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(1368),
+            id: DeclarationId(1382),
             name: Some("WorkflowSecret".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44904,7 +45678,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "scope".to_string(),
-                        ty: DeclarationId(1367),
+                        ty: DeclarationId(1381),
                     },
                 ],
             },
@@ -44919,7 +45693,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(1369),
+            id: DeclarationId(1383),
             name: Some("Job".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44929,39 +45703,39 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(2384),
+                        ty: DeclarationId(2404),
                     },
                     Field {
                         label: "runner".to_string(),
-                        ty: DeclarationId(1373),
+                        ty: DeclarationId(1387),
                     },
                     Field {
                         label: "steps".to_string(),
-                        ty: DeclarationId(2385),
+                        ty: DeclarationId(2405),
                     },
                     Field {
                         label: "needs".to_string(),
-                        ty: DeclarationId(2386),
+                        ty: DeclarationId(2406),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2388),
+                        ty: DeclarationId(2408),
                     },
                     Field {
                         label: "outputs".to_string(),
-                        ty: DeclarationId(2390),
+                        ty: DeclarationId(2410),
                     },
                     Field {
                         label: "if_condition".to_string(),
-                        ty: DeclarationId(2391),
+                        ty: DeclarationId(2411),
                     },
                     Field {
                         label: "strategy".to_string(),
-                        ty: DeclarationId(2392),
+                        ty: DeclarationId(2412),
                     },
                     Field {
                         label: "timeout_minutes".to_string(),
-                        ty: DeclarationId(2393),
+                        ty: DeclarationId(2413),
                     },
                     Field {
                         label: "continue_on_error".to_string(),
@@ -44969,7 +45743,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "concurrency".to_string(),
-                        ty: DeclarationId(2394),
+                        ty: DeclarationId(2414),
                     },
                 ],
             },
@@ -44984,17 +45758,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(1370),
+            id: DeclarationId(1384),
             name: Some("CancelInProgressSpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CancelInProgressBool".to_string(),
-                        ty: DeclarationId(2395),
+                        ty: DeclarationId(2415),
                     },
                     Field {
                         label: "CancelInProgressExpression".to_string(),
-                        ty: DeclarationId(2396),
+                        ty: DeclarationId(2416),
                     },
                 ],
             },
@@ -45009,17 +45783,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(1371),
+            id: DeclarationId(1385),
             name: Some("CancelInProgressWhenQueueMax".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "QueueMaxCancelInProgressFalse".to_string(),
-                        ty: DeclarationId(2397),
+                        ty: DeclarationId(2417),
                     },
                     Field {
                         label: "QueueMaxCancelInProgressExpression".to_string(),
-                        ty: DeclarationId(2398),
+                        ty: DeclarationId(2418),
                     },
                 ],
             },
@@ -45034,21 +45808,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(1372),
+            id: DeclarationId(1386),
             name: Some("ConcurrencySpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ConcurrencyScalar".to_string(),
-                        ty: DeclarationId(2399),
+                        ty: DeclarationId(2419),
                     },
                     Field {
                         label: "ConcurrencyMappingQueueMax".to_string(),
-                        ty: DeclarationId(2401),
+                        ty: DeclarationId(2421),
                     },
                     Field {
                         label: "ConcurrencyMappingQueueNotMax".to_string(),
-                        ty: DeclarationId(2404),
+                        ty: DeclarationId(2424),
                     },
                 ],
             },
@@ -45063,21 +45837,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(1373),
+            id: DeclarationId(1387),
             name: Some("RunnerSpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "HostedRunner".to_string(),
-                        ty: DeclarationId(2405),
+                        ty: DeclarationId(2425),
                     },
                     Field {
                         label: "SelfHosted".to_string(),
-                        ty: DeclarationId(2407),
+                        ty: DeclarationId(2427),
                     },
                     Field {
                         label: "RunsOnExpression".to_string(),
-                        ty: DeclarationId(2408),
+                        ty: DeclarationId(2428),
                     },
                 ],
             },
@@ -45092,33 +45866,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(1374),
+            id: DeclarationId(1388),
             name: Some("RunnerLabel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UbuntuLatest".to_string(),
-                        ty: DeclarationId(2409),
+                        ty: DeclarationId(2429),
                     },
                     Field {
                         label: "Ubuntu2404".to_string(),
-                        ty: DeclarationId(2410),
+                        ty: DeclarationId(2430),
                     },
                     Field {
                         label: "Ubuntu2204".to_string(),
-                        ty: DeclarationId(2411),
+                        ty: DeclarationId(2431),
                     },
                     Field {
                         label: "MacosLatest".to_string(),
-                        ty: DeclarationId(2412),
+                        ty: DeclarationId(2432),
                     },
                     Field {
                         label: "Macos14".to_string(),
-                        ty: DeclarationId(2413),
+                        ty: DeclarationId(2433),
                     },
                     Field {
                         label: "WindowsLatest".to_string(),
-                        ty: DeclarationId(2414),
+                        ty: DeclarationId(2434),
                     },
                 ],
             },
@@ -45133,17 +45907,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(1375),
+            id: DeclarationId(1389),
             name: Some("Step".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "RunStep".to_string(),
-                        ty: DeclarationId(2422),
+                        ty: DeclarationId(2442),
                     },
                     Field {
                         label: "UsesStep".to_string(),
-                        ty: DeclarationId(2431),
+                        ty: DeclarationId(2451),
                     },
                 ],
             },
@@ -45158,29 +45932,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(1376),
+            id: DeclarationId(1390),
             name: Some("ShellType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Bash".to_string(),
-                        ty: DeclarationId(2432),
+                        ty: DeclarationId(2452),
                     },
                     Field {
                         label: "Sh".to_string(),
-                        ty: DeclarationId(2433),
+                        ty: DeclarationId(2453),
                     },
                     Field {
                         label: "Pwsh".to_string(),
-                        ty: DeclarationId(2434),
+                        ty: DeclarationId(2454),
                     },
                     Field {
                         label: "Python".to_string(),
-                        ty: DeclarationId(2435),
+                        ty: DeclarationId(2455),
                     },
                     Field {
                         label: "Cmd".to_string(),
-                        ty: DeclarationId(2436),
+                        ty: DeclarationId(2456),
                     },
                 ],
             },
@@ -45195,7 +45969,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(1377),
+            id: DeclarationId(1391),
             name: Some("ActionRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -45224,41 +45998,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(1378),
+            id: DeclarationId(1392),
             name: Some("LogAnnotation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "AnnotationError".to_string(),
-                        ty: DeclarationId(2440),
+                        ty: DeclarationId(2460),
                     },
                     Field {
                         label: "AnnotationWarning".to_string(),
-                        ty: DeclarationId(2444),
+                        ty: DeclarationId(2464),
                     },
                     Field {
                         label: "AnnotationNotice".to_string(),
-                        ty: DeclarationId(2448),
+                        ty: DeclarationId(2468),
                     },
                     Field {
                         label: "AnnotationGroup".to_string(),
-                        ty: DeclarationId(2449),
+                        ty: DeclarationId(2469),
                     },
                     Field {
                         label: "AnnotationEndGroup".to_string(),
-                        ty: DeclarationId(2450),
+                        ty: DeclarationId(2470),
                     },
                     Field {
                         label: "SetOutput".to_string(),
-                        ty: DeclarationId(2451),
+                        ty: DeclarationId(2471),
                     },
                     Field {
                         label: "AddMask".to_string(),
-                        ty: DeclarationId(2452),
+                        ty: DeclarationId(2472),
                     },
                     Field {
                         label: "StopCommands".to_string(),
-                        ty: DeclarationId(2453),
+                        ty: DeclarationId(2473),
                     },
                 ],
             },
@@ -45273,7 +46047,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(1379),
+            id: DeclarationId(1393),
             name: Some("annotation_error_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45292,7 +46066,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(1380),
+            id: DeclarationId(1394),
             name: Some("annotation_warning_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45311,7 +46085,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(1381),
+            id: DeclarationId(1395),
             name: Some("annotation_notice_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45330,7 +46104,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(1382),
+            id: DeclarationId(1396),
             name: Some("annotation_group_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45349,7 +46123,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(1383),
+            id: DeclarationId(1397),
             name: Some("annotation_endgroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45368,7 +46142,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(1384),
+            id: DeclarationId(1398),
             name: Some("annotation_set_output_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45387,7 +46161,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(1385),
+            id: DeclarationId(1399),
             name: Some("annotation_add_mask_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45406,7 +46180,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(1386),
+            id: DeclarationId(1400),
             name: Some("annotation_stop_commands_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45425,17 +46199,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(1387),
+            id: DeclarationId(1401),
             name: Some("ArtifactOp".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Upload".to_string(),
-                        ty: DeclarationId(2455),
+                        ty: DeclarationId(2475),
                     },
                     Field {
                         label: "Download".to_string(),
-                        ty: DeclarationId(2457),
+                        ty: DeclarationId(2477),
                     },
                 ],
             },
@@ -45450,21 +46224,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(1388),
+            id: DeclarationId(1402),
             name: Some("MissingFilesBehavior".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Warn".to_string(),
-                        ty: DeclarationId(2458),
+                        ty: DeclarationId(2478),
                     },
                     Field {
                         label: "ErrorOut".to_string(),
-                        ty: DeclarationId(2459),
+                        ty: DeclarationId(2479),
                     },
                     Field {
                         label: "Ignore".to_string(),
-                        ty: DeclarationId(2460),
+                        ty: DeclarationId(2480),
                     },
                 ],
             },
@@ -45479,15 +46253,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(1389),
+            id: DeclarationId(1403),
             name: Some("upload_artifact_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1377),
+                template: DeclarationId(1391),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1377)),
+            meta_tag: Some(DeclarationId(1391)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -45500,15 +46274,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(1390),
+            id: DeclarationId(1404),
             name: Some("download_artifact_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1377),
+                template: DeclarationId(1391),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1377)),
+            meta_tag: Some(DeclarationId(1391)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -45521,21 +46295,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(1391),
+            id: DeclarationId(1405),
             name: Some("MatrixStrategy".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "dimensions".to_string(),
-                        ty: DeclarationId(2462),
+                        ty: DeclarationId(2482),
                     },
                     Field {
                         label: "include".to_string(),
-                        ty: DeclarationId(2464),
+                        ty: DeclarationId(2484),
                     },
                     Field {
                         label: "exclude".to_string(),
-                        ty: DeclarationId(2466),
+                        ty: DeclarationId(2486),
                     },
                     Field {
                         label: "fail_fast".to_string(),
@@ -45543,7 +46317,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "max_parallel".to_string(),
-                        ty: DeclarationId(2467),
+                        ty: DeclarationId(2487),
                     },
                 ],
             },
@@ -45558,33 +46332,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(1392),
+            id: DeclarationId(1406),
             name: Some("CheckConclusion".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Success".to_string(),
-                        ty: DeclarationId(2468),
+                        ty: DeclarationId(2488),
                     },
                     Field {
                         label: "Failure".to_string(),
-                        ty: DeclarationId(2469),
+                        ty: DeclarationId(2489),
                     },
                     Field {
                         label: "Cancelled".to_string(),
-                        ty: DeclarationId(2470),
+                        ty: DeclarationId(2490),
                     },
                     Field {
                         label: "Skipped".to_string(),
-                        ty: DeclarationId(2471),
+                        ty: DeclarationId(2491),
                     },
                     Field {
                         label: "TimedOut".to_string(),
-                        ty: DeclarationId(2472),
+                        ty: DeclarationId(2492),
                     },
                     Field {
                         label: "ActionRequired".to_string(),
-                        ty: DeclarationId(2473),
+                        ty: DeclarationId(2493),
                     },
                 ],
             },
@@ -45599,15 +46373,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(1393),
+            id: DeclarationId(1407),
             name: Some("checkout_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1377),
+                template: DeclarationId(1391),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1377)),
+            meta_tag: Some(DeclarationId(1391)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -45620,15 +46394,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(1394),
+            id: DeclarationId(1408),
             name: Some("setup_rust_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1377),
+                template: DeclarationId(1391),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1377)),
+            meta_tag: Some(DeclarationId(1391)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -45641,15 +46415,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(1395),
+            id: DeclarationId(1409),
             name: Some("cache_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1377),
+                template: DeclarationId(1391),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1377)),
+            meta_tag: Some(DeclarationId(1391)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -45662,7 +46436,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(1396),
+            id: DeclarationId(1410),
             name: Some("max_job_timeout_minutes".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -45679,7 +46453,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(1397),
+            id: DeclarationId(1411),
             name: Some("default_job_timeout_minutes".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -45696,7 +46470,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(1398),
+            id: DeclarationId(1412),
             name: Some("max_matrix_combinations".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -45713,7 +46487,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(1399),
+            id: DeclarationId(1413),
             name: Some("github_actions_workflows_dir".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45732,17 +46506,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(1400),
+            id: DeclarationId(1414),
             name: Some("GitHubActionsWorkflowExtension".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "GitHubActionsWorkflowYml".to_string(),
-                        ty: DeclarationId(2474),
+                        ty: DeclarationId(2494),
                     },
                     Field {
                         label: "GitHubActionsWorkflowYaml".to_string(),
-                        ty: DeclarationId(2475),
+                        ty: DeclarationId(2495),
                     },
                 ],
             },
@@ -45757,7 +46531,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(1401),
+            id: DeclarationId(1415),
             name: Some("GitHubActionsWorkflowStemSegment".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
@@ -45766,17 +46540,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(2476)),
+            refinement: Some(DeclarationId(2496)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2615, 2714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1402),
+            id: DeclarationId(1416),
             name: Some("GitHubActionsWorkflowStem".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "segment".to_string(),
-                    ty: DeclarationId(1401),
+                    ty: DeclarationId(1415),
                 }],
             },
             type_params: vec![],
@@ -45790,17 +46564,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(1403),
+            id: DeclarationId(1417),
             name: Some("GitHubActionsWorkflowFileRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "stem".to_string(),
-                        ty: DeclarationId(1402),
+                        ty: DeclarationId(1416),
                     },
                     Field {
                         label: "extension".to_string(),
-                        ty: DeclarationId(1400),
+                        ty: DeclarationId(1414),
                     },
                 ],
             },
@@ -45815,7 +46589,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(1404),
+            id: DeclarationId(1418),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45835,7 +46609,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(1405),
+            id: DeclarationId(1419),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45855,7 +46629,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(1406),
+            id: DeclarationId(1420),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45875,7 +46649,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(1407),
+            id: DeclarationId(1421),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45895,7 +46669,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(1408),
+            id: DeclarationId(1422),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45915,7 +46689,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(1409),
+            id: DeclarationId(1423),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(695), DeclarationId(694)],
@@ -45933,7 +46707,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(1410),
+            id: DeclarationId(1424),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45953,7 +46727,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(1411),
+            id: DeclarationId(1425),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(697), DeclarationId(698)],
@@ -45971,7 +46745,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(1412),
+            id: DeclarationId(1426),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45991,7 +46765,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(1413),
+            id: DeclarationId(1427),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46011,7 +46785,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(1414),
+            id: DeclarationId(1428),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46031,7 +46805,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(1415),
+            id: DeclarationId(1429),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46051,7 +46825,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(1416),
+            id: DeclarationId(1430),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(702)],
@@ -46069,7 +46843,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(1417),
+            id: DeclarationId(1431),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46089,7 +46863,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(1418),
+            id: DeclarationId(1432),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46109,7 +46883,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(1419),
+            id: DeclarationId(1433),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(705)],
@@ -46127,7 +46901,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(1420),
+            id: DeclarationId(1434),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46147,7 +46921,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(1421),
+            id: DeclarationId(1435),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46167,7 +46941,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(1422),
+            id: DeclarationId(1436),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46187,11 +46961,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(1423),
+            id: DeclarationId(1437),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(707)],
-                output: DeclarationId(1422),
+                output: DeclarationId(1436),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -46205,7 +46979,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(1424),
+            id: DeclarationId(1438),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46225,7 +46999,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(1425),
+            id: DeclarationId(1439),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46245,7 +47019,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(1426),
+            id: DeclarationId(1440),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46265,7 +47039,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(1427),
+            id: DeclarationId(1441),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46285,7 +47059,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(1428),
+            id: DeclarationId(1442),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -46305,13 +47079,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(1429),
+            id: DeclarationId(1443),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1428),
+                    value: DeclarationId(1442),
                 }],
             },
             type_params: vec![],
@@ -46325,7 +47099,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(1430),
+            id: DeclarationId(1444),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46345,7 +47119,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(1431),
+            id: DeclarationId(1445),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -46365,13 +47139,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(1432),
+            id: DeclarationId(1446),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1431),
+                    value: DeclarationId(1445),
                 }],
             },
             type_params: vec![],
@@ -46385,7 +47159,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(1433),
+            id: DeclarationId(1447),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46405,7 +47179,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(1434),
+            id: DeclarationId(1448),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -46419,7 +47193,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(1435),
+            id: DeclarationId(1449),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46439,7 +47213,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(1436),
+            id: DeclarationId(1450),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -46449,7 +47223,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "tail".to_string(),
-                        ty: DeclarationId(1435),
+                        ty: DeclarationId(1449),
                     },
                 ],
             },
@@ -46464,7 +47238,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(1437),
+            id: DeclarationId(1451),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46484,7 +47258,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(1438),
+            id: DeclarationId(1452),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46504,7 +47278,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(1439),
+            id: DeclarationId(1453),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -46523,7 +47297,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(1440),
+            id: DeclarationId(1454),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -46543,7 +47317,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(1441),
+            id: DeclarationId(1455),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -46563,7 +47337,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(1442),
+            id: DeclarationId(1456),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -46583,11 +47357,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(1443),
+            id: DeclarationId(1457),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1442),
+                    DeclarationId(1456),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -46602,7 +47376,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(1444),
+            id: DeclarationId(1458),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46622,7 +47396,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(1445),
+            id: DeclarationId(1459),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -46642,11 +47416,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(1446),
+            id: DeclarationId(1460),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1445),
+                    DeclarationId(1459),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -46661,7 +47435,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(1447),
+            id: DeclarationId(1461),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46681,7 +47455,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(1448),
+            id: DeclarationId(1462),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -46700,7 +47474,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(1449),
+            id: DeclarationId(1463),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -46719,7 +47493,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(1450),
+            id: DeclarationId(1464),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -46738,7 +47512,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(1451),
+            id: DeclarationId(1465),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46758,7 +47532,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(1452),
+            id: DeclarationId(1466),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46778,7 +47552,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(1453),
+            id: DeclarationId(1467),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46797,7 +47571,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(1454),
+            id: DeclarationId(1468),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46816,7 +47590,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(1455),
+            id: DeclarationId(1469),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46836,7 +47610,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(1456),
+            id: DeclarationId(1470),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46856,12 +47630,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(1457),
+            id: DeclarationId(1471),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1456),
+                    ty: DeclarationId(1470),
                 }],
             },
             type_params: vec![],
@@ -46875,7 +47649,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(1458),
+            id: DeclarationId(1472),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -46900,7 +47674,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(1459),
+            id: DeclarationId(1473),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46919,7 +47693,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(1460),
+            id: DeclarationId(1474),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -46948,7 +47722,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(1461),
+            id: DeclarationId(1475),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -46962,7 +47736,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(1462),
+            id: DeclarationId(1476),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46981,7 +47755,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(1463),
+            id: DeclarationId(1477),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47000,7 +47774,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(1464),
+            id: DeclarationId(1478),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47019,7 +47793,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(1465),
+            id: DeclarationId(1479),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47033,7 +47807,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(1466),
+            id: DeclarationId(1480),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47052,7 +47826,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(1467),
+            id: DeclarationId(1481),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47071,7 +47845,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(1468),
+            id: DeclarationId(1482),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47085,7 +47859,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(1469),
+            id: DeclarationId(1483),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47104,7 +47878,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(1470),
+            id: DeclarationId(1484),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47123,7 +47897,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(1471),
+            id: DeclarationId(1485),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47142,7 +47916,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(1472),
+            id: DeclarationId(1486),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -47162,12 +47936,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(1473),
+            id: DeclarationId(1487),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1472),
+                    ty: DeclarationId(1486),
                 }],
             },
             type_params: vec![],
@@ -47181,7 +47955,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(1474),
+            id: DeclarationId(1488),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47195,7 +47969,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(1475),
+            id: DeclarationId(1489),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47209,7 +47983,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(1476),
+            id: DeclarationId(1490),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47228,7 +48002,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(1477),
+            id: DeclarationId(1491),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47247,7 +48021,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(1478),
+            id: DeclarationId(1492),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -47272,7 +48046,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(1479),
+            id: DeclarationId(1493),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -47309,7 +48083,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(1480),
+            id: DeclarationId(1494),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47323,7 +48097,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(1481),
+            id: DeclarationId(1495),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -47343,12 +48117,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(1482),
+            id: DeclarationId(1496),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "first_breaker".to_string(),
-                    ty: DeclarationId(1481),
+                    ty: DeclarationId(1495),
                 }],
             },
             type_params: vec![],
@@ -47362,7 +48136,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(1483),
+            id: DeclarationId(1497),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -47382,12 +48156,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(1484),
+            id: DeclarationId(1498),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "ops".to_string(),
-                    ty: DeclarationId(1483),
+                    ty: DeclarationId(1497),
                 }],
             },
             type_params: vec![],
@@ -47401,7 +48175,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(1485),
+            id: DeclarationId(1499),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -47421,12 +48195,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(1486),
+            id: DeclarationId(1500),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "arms".to_string(),
-                    ty: DeclarationId(1485),
+                    ty: DeclarationId(1499),
                 }],
             },
             type_params: vec![],
@@ -47440,7 +48214,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(1487),
+            id: DeclarationId(1501),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47459,7 +48233,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(1488),
+            id: DeclarationId(1502),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -47479,12 +48253,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(1489),
+            id: DeclarationId(1503),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "branches".to_string(),
-                    ty: DeclarationId(1488),
+                    ty: DeclarationId(1502),
                 }],
             },
             type_params: vec![],
@@ -47498,7 +48272,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(1490),
+            id: DeclarationId(1504),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47517,7 +48291,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(1491),
+            id: DeclarationId(1505),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47536,7 +48310,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(1492),
+            id: DeclarationId(1506),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47550,7 +48324,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(1493),
+            id: DeclarationId(1507),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47564,7 +48338,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(1494),
+            id: DeclarationId(1508),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47578,7 +48352,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(1495),
+            id: DeclarationId(1509),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47592,7 +48366,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(1496),
+            id: DeclarationId(1510),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47606,7 +48380,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(1497),
+            id: DeclarationId(1511),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47625,7 +48399,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(1498),
+            id: DeclarationId(1512),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47644,7 +48418,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(1499),
+            id: DeclarationId(1513),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47658,7 +48432,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(1500),
+            id: DeclarationId(1514),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47677,7 +48451,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(1501),
+            id: DeclarationId(1515),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47696,7 +48470,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(1502),
+            id: DeclarationId(1516),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47710,7 +48484,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(1503),
+            id: DeclarationId(1517),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47729,7 +48503,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(1504),
+            id: DeclarationId(1518),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47748,7 +48522,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(1505),
+            id: DeclarationId(1519),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47767,7 +48541,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(1506),
+            id: DeclarationId(1520),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47786,7 +48560,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(1507),
+            id: DeclarationId(1521),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47805,7 +48579,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(1508),
+            id: DeclarationId(1522),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47824,7 +48598,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(1509),
+            id: DeclarationId(1523),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47843,12 +48617,12 @@ 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(1510),
+            id: DeclarationId(1524),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1143),
+                template: DeclarationId(894),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1144),
+                    parameter: DeclarationId(895),
                     value: DeclarationId(723),
                 }],
             },
@@ -47863,12 +48637,12 @@ 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(1511),
+            id: DeclarationId(1525),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1143),
+                template: DeclarationId(894),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1144),
+                    parameter: DeclarationId(895),
                     value: DeclarationId(723),
                 }],
             },
@@ -47883,7 +48657,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(1512),
+            id: DeclarationId(1526),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47897,7 +48671,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(1513),
+            id: DeclarationId(1527),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47916,7 +48690,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(1514),
+            id: DeclarationId(1528),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47930,7 +48704,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(1515),
+            id: DeclarationId(1529),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47949,7 +48723,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(1516),
+            id: DeclarationId(1530),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47968,7 +48742,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(1517),
+            id: DeclarationId(1531),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47987,7 +48761,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(1518),
+            id: DeclarationId(1532),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48006,7 +48780,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(1519),
+            id: DeclarationId(1533),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48025,7 +48799,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(1520),
+            id: DeclarationId(1534),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48044,7 +48818,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(1521),
+            id: DeclarationId(1535),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48063,7 +48837,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(1522),
+            id: DeclarationId(1536),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48082,7 +48856,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(1523),
+            id: DeclarationId(1537),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48101,7 +48875,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(1524),
+            id: DeclarationId(1538),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48115,7 +48889,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(1525),
+            id: DeclarationId(1539),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48134,7 +48908,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(1526),
+            id: DeclarationId(1540),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48153,7 +48927,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(1527),
+            id: DeclarationId(1541),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48167,7 +48941,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(1528),
+            id: DeclarationId(1542),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48186,7 +48960,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(1529),
+            id: DeclarationId(1543),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -48211,7 +48985,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(1530),
+            id: DeclarationId(1544),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48225,7 +48999,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(1531),
+            id: DeclarationId(1545),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(786),
@@ -48245,12 +49019,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(1532),
+            id: DeclarationId(1546),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1531),
+                    ty: DeclarationId(1545),
                 }],
             },
             type_params: vec![],
@@ -48264,7 +49038,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(1533),
+            id: DeclarationId(1547),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48278,7 +49052,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(1534),
+            id: DeclarationId(1548),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48297,7 +49071,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(1535),
+            id: DeclarationId(1549),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48311,7 +49085,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(1536),
+            id: DeclarationId(1550),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48325,7 +49099,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(1537),
+            id: DeclarationId(1551),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48344,7 +49118,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(1538),
+            id: DeclarationId(1552),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48363,7 +49137,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(1539),
+            id: DeclarationId(1553),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48383,12 +49157,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(1540),
+            id: DeclarationId(1554),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1539),
+                    ty: DeclarationId(1553),
                 }],
             },
             type_params: vec![],
@@ -48402,7 +49176,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(1541),
+            id: DeclarationId(1555),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48422,12 +49196,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(1542),
+            id: DeclarationId(1556),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1541),
+                    ty: DeclarationId(1555),
                 }],
             },
             type_params: vec![],
@@ -48441,7 +49215,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(1543),
+            id: DeclarationId(1557),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48461,12 +49235,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(1544),
+            id: DeclarationId(1558),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1543),
+                    ty: DeclarationId(1557),
                 }],
             },
             type_params: vec![],
@@ -48480,7 +49254,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(1545),
+            id: DeclarationId(1559),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48500,7 +49274,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(1546),
+            id: DeclarationId(1560),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -48510,7 +49284,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "payload".to_string(),
-                        ty: DeclarationId(1545),
+                        ty: DeclarationId(1559),
                     },
                 ],
             },
@@ -48525,7 +49299,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(1547),
+            id: DeclarationId(1561),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48544,7 +49318,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(1548),
+            id: DeclarationId(1562),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48564,12 +49338,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(1549),
+            id: DeclarationId(1563),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1548),
+                    ty: DeclarationId(1562),
                 }],
             },
             type_params: vec![],
@@ -48583,7 +49357,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(1550),
+            id: DeclarationId(1564),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48602,7 +49376,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(1551),
+            id: DeclarationId(1565),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48622,12 +49396,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(1552),
+            id: DeclarationId(1566),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1551),
+                    ty: DeclarationId(1565),
                 }],
             },
             type_params: vec![],
@@ -48641,7 +49415,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(1553),
+            id: DeclarationId(1567),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48661,12 +49435,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(1554),
+            id: DeclarationId(1568),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1553),
+                    ty: DeclarationId(1567),
                 }],
             },
             type_params: vec![],
@@ -48680,7 +49454,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(1555),
+            id: DeclarationId(1569),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48699,7 +49473,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(1556),
+            id: DeclarationId(1570),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48718,7 +49492,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(1557),
+            id: DeclarationId(1571),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48732,7 +49506,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(1558),
+            id: DeclarationId(1572),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48746,7 +49520,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(1559),
+            id: DeclarationId(1573),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48765,7 +49539,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(1560),
+            id: DeclarationId(1574),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48784,7 +49558,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(1561),
+            id: DeclarationId(1575),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48804,12 +49578,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(1576),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "children".to_string(),
-                    ty: DeclarationId(1561),
+                    ty: DeclarationId(1575),
                 }],
             },
             type_params: vec![],
@@ -48823,7 +49597,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(1563),
+            id: DeclarationId(1577),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48843,12 +49617,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(1564),
+            id: DeclarationId(1578),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "variants".to_string(),
-                    ty: DeclarationId(1563),
+                    ty: DeclarationId(1577),
                 }],
             },
             type_params: vec![],
@@ -48862,7 +49636,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(1565),
+            id: DeclarationId(1579),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48882,13 +49656,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(1566),
+            id: DeclarationId(1580),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1565),
+                        ty: DeclarationId(1579),
                     },
                     Field {
                         label: "output".to_string(),
@@ -48911,7 +49685,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(1567),
+            id: DeclarationId(1581),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -48936,7 +49710,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(1568),
+            id: DeclarationId(1582),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48956,7 +49730,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(1569),
+            id: DeclarationId(1583),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -48966,7 +49740,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "arguments".to_string(),
-                        ty: DeclarationId(1568),
+                        ty: DeclarationId(1582),
                     },
                 ],
             },
@@ -48981,7 +49755,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(1570),
+            id: DeclarationId(1584),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49000,7 +49774,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(1571),
+            id: DeclarationId(1585),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49020,7 +49794,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(1572),
+            id: DeclarationId(1586),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49040,7 +49814,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(1573),
+            id: DeclarationId(1587),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49059,7 +49833,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(1574),
+            id: DeclarationId(1588),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49078,7 +49852,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(1575),
+            id: DeclarationId(1589),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49097,7 +49871,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(1576),
+            id: DeclarationId(1590),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49116,7 +49890,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(1577),
+            id: DeclarationId(1591),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49136,7 +49910,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(1578),
+            id: DeclarationId(1592),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49150,7 +49924,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(1579),
+            id: DeclarationId(1593),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49164,7 +49938,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(1580),
+            id: DeclarationId(1594),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49178,7 +49952,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(1581),
+            id: DeclarationId(1595),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49192,7 +49966,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(1582),
+            id: DeclarationId(1596),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49206,7 +49980,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(1583),
+            id: DeclarationId(1597),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49220,7 +49994,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(1584),
+            id: DeclarationId(1598),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49234,7 +50008,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(1585),
+            id: DeclarationId(1599),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49248,7 +50022,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(1586),
+            id: DeclarationId(1600),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49262,7 +50036,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(1587),
+            id: DeclarationId(1601),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49276,7 +50050,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(1588),
+            id: DeclarationId(1602),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49290,7 +50064,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(1589),
+            id: DeclarationId(1603),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49304,7 +50078,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(1590),
+            id: DeclarationId(1604),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49323,7 +50097,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(1591),
+            id: DeclarationId(1605),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49342,7 +50116,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(1592),
+            id: DeclarationId(1606),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49361,7 +50135,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(1593),
+            id: DeclarationId(1607),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49380,7 +50154,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(1594),
+            id: DeclarationId(1608),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49399,7 +50173,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(1595),
+            id: DeclarationId(1609),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49418,7 +50192,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(1596),
+            id: DeclarationId(1610),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49437,7 +50211,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(1597),
+            id: DeclarationId(1611),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -49462,7 +50236,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(1598),
+            id: DeclarationId(1612),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49481,7 +50255,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(1599),
+            id: DeclarationId(1613),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49500,7 +50274,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(1600),
+            id: DeclarationId(1614),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -49520,7 +50294,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(1601),
+            id: DeclarationId(1615),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(725),
@@ -49540,7 +50314,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(1602),
+            id: DeclarationId(1616),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49559,7 +50333,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(1603),
+            id: DeclarationId(1617),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -49584,7 +50358,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(1604),
+            id: DeclarationId(1618),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49603,7 +50377,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(1605),
+            id: DeclarationId(1619),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49623,7 +50397,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(1606),
+            id: DeclarationId(1620),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49637,7 +50411,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(1607),
+            id: DeclarationId(1621),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49657,7 +50431,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(1608),
+            id: DeclarationId(1622),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49676,7 +50450,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(1609),
+            id: DeclarationId(1623),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49690,7 +50464,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(1610),
+            id: DeclarationId(1624),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49710,7 +50484,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(1611),
+            id: DeclarationId(1625),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49729,7 +50503,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(1612),
+            id: DeclarationId(1626),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49748,7 +50522,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(1613),
+            id: DeclarationId(1627),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49767,7 +50541,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(1614),
+            id: DeclarationId(1628),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49786,7 +50560,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(1615),
+            id: DeclarationId(1629),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49805,7 +50579,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(1616),
+            id: DeclarationId(1630),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49824,7 +50598,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(1617),
+            id: DeclarationId(1631),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49843,7 +50617,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(1618),
+            id: DeclarationId(1632),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49863,7 +50637,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(1619),
+            id: DeclarationId(1633),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49883,7 +50657,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(1620),
+            id: DeclarationId(1634),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49903,7 +50677,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(1621),
+            id: DeclarationId(1635),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49923,7 +50697,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(1622),
+            id: DeclarationId(1636),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49942,7 +50716,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(1623),
+            id: DeclarationId(1637),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49956,7 +50730,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(1624),
+            id: DeclarationId(1638),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -49976,12 +50750,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(1625),
+            id: DeclarationId(1639),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "candidates".to_string(),
-                    ty: DeclarationId(1624),
+                    ty: DeclarationId(1638),
                 }],
             },
             type_params: vec![],
@@ -49995,13 +50769,13 @@ 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(1626),
+            id: DeclarationId(1640),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1143),
+                template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1144),
-                    value: DeclarationId(849),
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(853),
                 }],
             },
             type_params: vec![],
@@ -50012,16 +50786,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/algebra.dag", 10942, 10962),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2718, 2749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1627),
+            id: DeclarationId(1641),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1143),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1144),
-                    value: DeclarationId(849),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "content".to_string(),
+                    ty: DeclarationId(1640),
                 }],
             },
             type_params: vec![],
@@ -50032,16 +50805,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/algebra.dag", 11026, 11046),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2690, 2751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1628),
+            id: DeclarationId(1642),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(727),
+                template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(728),
-                    value: DeclarationId(849),
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(854),
                 }],
             },
             type_params: vec![],
@@ -50052,16 +50825,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/algebra.dag", 11114, 11144),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2784, 2820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1629),
+            id: DeclarationId(1643),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "content".to_string(),
+                    ty: DeclarationId(1642),
                 }],
             },
             type_params: vec![],
@@ -50072,16 +50844,40 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 11611, 11629),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2756, 2822),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1630),
+            id: DeclarationId(1644),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(727),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(728),
-                    value: DeclarationId(849),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "media_type".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "base64".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/anthropic_schema.dag", 3211, 3276),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1645),
+            name: None,
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "url".to_string(),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -50092,16 +50888,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/algebra.dag", 11635, 11665),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3281, 3305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1631),
+            id: DeclarationId(1646),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "text".to_string(),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -50112,16 +50907,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/algebra.dag", 14162, 14180),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3568, 3596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1632),
+            id: DeclarationId(1647),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(727),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(728),
-                    value: DeclarationId(849),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "source".to_string(),
+                    ty: DeclarationId(843),
                 }],
             },
             type_params: vec![],
@@ -50132,16 +50926,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/algebra.dag", 22217, 22247),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3601, 3637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1633),
+            id: DeclarationId(1648),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -50152,16 +50945,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/algebra.dag", 22252, 22270),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4332, 4354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1634),
+            id: DeclarationId(1649),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(849),
+                    value: DeclarationId(851),
                 }],
             },
             type_params: vec![],
@@ -50172,16 +50965,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/algebra.dag", 22530, 22548),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4376, 4406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1635),
+            id: DeclarationId(1650),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(1649),
                 }],
             },
             type_params: vec![],
@@ -50192,16 +50984,43 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 22553, 22571),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4359, 4407),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1636),
+            id: DeclarationId(1651),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
+            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", 5616, 5623),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1652),
+            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", 5749, 5761),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1653),
+            name: None,
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "text".to_string(),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -50212,16 +51031,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/algebra.dag", 23044, 23062),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5979, 6014),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1637),
+            id: DeclarationId(1654),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "source".to_string(),
+                    ty: DeclarationId(843),
                 }],
             },
             type_params: vec![],
@@ -50232,16 +51050,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/algebra.dag", 23067, 23085),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6019, 6062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1638),
+            id: DeclarationId(1655),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "source".to_string(),
+                    ty: DeclarationId(852),
                 }],
             },
             type_params: vec![],
@@ -50252,16 +51069,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/algebra.dag", 23186, 23204),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6067, 6144),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1639),
+            id: DeclarationId(1656),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(849),
+                    value: DeclarationId(850),
                 }],
             },
             type_params: vec![],
@@ -50272,18 +51089,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/algebra.dag", 23524, 23542),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6234, 6268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1640),
+            id: DeclarationId(1657),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(846),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -50292,18 +51108,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/algebra.dag", 23547, 23565),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1641),
+            id: DeclarationId(1658),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(845),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -50312,17 +51127,34 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 25113, 25131),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1642),
+            id: DeclarationId(1659),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
-                }],
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "source".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "title".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "content".to_string(),
+                        ty: DeclarationId(1656),
+                    },
+                    Field {
+                        label: "citations".to_string(),
+                        ty: DeclarationId(1657),
+                    },
+                    Field {
+                        label: "cache_control".to_string(),
+                        ty: DeclarationId(1658),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -50332,16 +51164,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/algebra.dag", 25384, 25402),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6149, 6364),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1643),
+            id: DeclarationId(1660),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "tool_name".to_string(),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -50352,16 +51183,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/algebra.dag", 25850, 25868),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6369, 6418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1644),
+            id: DeclarationId(1661),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "text".to_string(),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -50372,18 +51202,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/algebra.dag", 27885, 27903),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6926, 6962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1645),
+            id: DeclarationId(1662),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(847),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -50392,18 +51221,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/algebra.dag", 27933, 27951),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1646),
+            id: DeclarationId(1663),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(128),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -50412,17 +51240,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 28238, 28256),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1647),
+            id: DeclarationId(1664),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
-                }],
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "tool_use_id".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "content".to_string(),
+                        ty: DeclarationId(1662),
+                    },
+                    Field {
+                        label: "is_error".to_string(),
+                        ty: DeclarationId(1663),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -50432,16 +51269,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/algebra.dag", 28284, 28302),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6967, 7085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1648),
+            id: DeclarationId(1665),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "text".to_string(),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -50452,17 +51288,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 28662, 28680),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7532, 7570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1649),
+            id: DeclarationId(1666),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(849),
-                }],
+            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),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -50472,10 +51317,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 28685, 28703),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7575, 7658),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1650),
+            id: DeclarationId(1667),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50486,10 +51331,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 4953, 4965),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8016, 8023),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1651),
+            id: DeclarationId(1668),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50500,10 +51345,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 4970, 4986),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8028, 8037),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1652),
+            id: DeclarationId(1669),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50514,10 +51359,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 4991, 5005),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8042, 8054),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1653),
+            id: DeclarationId(1670),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50528,10 +51373,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 5855, 5868),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8059, 8066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1654),
+            id: DeclarationId(1671),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50542,10 +51387,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 5873, 5888),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8071, 8080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1655),
+            id: DeclarationId(1672),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50556,10 +51401,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 5893, 5909),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8085, 8092),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1656),
+            id: DeclarationId(1673),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50570,14 +51415,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/algebra.dag", 5914, 5927),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8097, 8123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1657),
+            id: DeclarationId(1674),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(842),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -50589,14 +51434,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/algebra.dag", 6780, 6801),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1658),
+            id: DeclarationId(1675),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(843),
+                    DeclarationId(230),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -50608,17 +51453,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/algebra.dag", 6816, 6826),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1659),
+            id: DeclarationId(1676),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            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(1674),
+                    },
+                    Field {
+                        label: "file_id".to_string(),
+                        ty: DeclarationId(1675),
+                    },
+                    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,
@@ -50627,10 +51494,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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", 8363, 8506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1660),
+            id: DeclarationId(1677),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -50646,12 +51513,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/algebra.dag", 7429, 7436),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1661),
+            id: DeclarationId(1678),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -50660,16 +51532,38 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 8405, 8414),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1662),
+            id: DeclarationId(1679),
             name: None,
             connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "previous".to_string(),
-                    ty: DeclarationId(848),
-                }],
+                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(1677),
+                    },
+                    Field {
+                        label: "file_id".to_string(),
+                        ty: DeclarationId(1678),
+                    },
+                    Field {
+                        label: "start_page_number".to_string(),
+                        ty: DeclarationId(93),
+                    },
+                    Field {
+                        label: "end_page_number".to_string(),
+                        ty: DeclarationId(93),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -50679,17 +51573,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/algebra.dag", 8419, 8465),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8511, 8656),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1663),
+            id: DeclarationId(1680),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(93),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -50698,17 +51592,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/algebra.dag", 9506, 9523),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1664),
+            id: DeclarationId(1681),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(845),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -50717,20 +51611,36 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 9528, 9552),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1665),
+            id: DeclarationId(1682),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "var".to_string(),
-                        ty: DeclarationId(845),
+                        label: "cited_text".to_string(),
+                        ty: DeclarationId(230),
                     },
                     Field {
-                        label: "degree".to_string(),
-                        ty: DeclarationId(848),
+                        label: "document_index".to_string(),
+                        ty: DeclarationId(93),
+                    },
+                    Field {
+                        label: "document_title".to_string(),
+                        ty: DeclarationId(1680),
+                    },
+                    Field {
+                        label: "file_id".to_string(),
+                        ty: DeclarationId(1681),
+                    },
+                    Field {
+                        label: "start_block_index".to_string(),
+                        ty: DeclarationId(93),
+                    },
+                    Field {
+                        label: "end_block_index".to_string(),
+                        ty: DeclarationId(93),
                     },
                 ],
             },
@@ -50742,18 +51652,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/algebra.dag", 9557, 9619),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8661, 8814),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1666),
+            id: DeclarationId(1683),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(727),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(728),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -50762,16 +51671,30 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 9636, 9666),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1667),
+            id: DeclarationId(1684),
             name: None,
             connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1666),
-                }],
+                children: vec![
+                    Field {
+                        label: "cited_text".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "encrypted_index".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "title".to_string(),
+                        ty: DeclarationId(1683),
+                    },
+                    Field {
+                        label: "url".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -50781,18 +51704,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/algebra.dag", 9624, 9667),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8819, 8919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1668),
+            id: DeclarationId(1685),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(727),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(728),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -50801,16 +51723,38 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 9680, 9710),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1669),
+            id: DeclarationId(1686),
             name: None,
             connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1668),
-                }],
+                children: vec![
+                    Field {
+                        label: "cited_text".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "source".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "title".to_string(),
+                        ty: DeclarationId(1685),
+                    },
+                    Field {
+                        label: "search_result_index".to_string(),
+                        ty: DeclarationId(93),
+                    },
+                    Field {
+                        label: "start_block_index".to_string(),
+                        ty: DeclarationId(93),
+                    },
+                    Field {
+                        label: "end_block_index".to_string(),
+                        ty: DeclarationId(93),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -50820,15 +51764,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/algebra.dag", 9672, 9711),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8924, 9071),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1670),
+            id: DeclarationId(1687),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(845),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(856),
                 }],
             },
             type_params: vec![],
@@ -50839,17 +51784,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/algebra.dag", 9716, 9737),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1671),
+            id: DeclarationId(1688),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(1687),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -50858,17 +51803,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 9742, 9761),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1672),
+            id: DeclarationId(1689),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(31),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(32),
-                    value: DeclarationId(849),
-                }],
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "text".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "citations".to_string(),
+                        ty: DeclarationId(1688),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -50878,12 +51828,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 9479, 9501),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9650, 9732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1673),
+            id: DeclarationId(1690),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "thinking".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "signature".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -50892,12 +51853,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/algebra.dag", 18143, 18156),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9737, 9798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1674),
+            id: DeclarationId(1691),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "redacted_data".to_string(),
+                    ty: DeclarationId(230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -50906,12 +51872,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/algebra.dag", 18161, 18169),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9803, 9858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1675),
+            id: DeclarationId(1692),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(130),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -50920,12 +51891,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 18174, 18185),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1676),
+            id: DeclarationId(1693),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            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(1692),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -50934,12 +51924,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/algebra.dag", 18190, 18207),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9863, 9940),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1677),
+            id: DeclarationId(1694),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(130),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -50948,16 +51943,30 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 18212, 18226),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1678),
+            id: DeclarationId(1695),
             name: None,
             connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "degree".to_string(),
-                    ty: DeclarationId(1205),
-                }],
+                children: vec![
+                    Field {
+                        label: "id".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "name".to_string(),
+                        ty: DeclarationId(858),
+                    },
+                    Field {
+                        label: "input".to_string(),
+                        ty: DeclarationId(130),
+                    },
+                    Field {
+                        label: "caller".to_string(),
+                        ty: DeclarationId(1694),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -50967,12 +51976,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/algebra.dag", 18231, 18280),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9945, 10045),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1679),
+            id: DeclarationId(1696),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(130),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -50981,12 +51995,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 18285, 18301),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1680),
+            id: DeclarationId(1697),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "tool_use_id".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "content".to_string(),
+                        ty: DeclarationId(130),
+                    },
+                    Field {
+                        label: "caller".to_string(),
+                        ty: DeclarationId(1696),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -50995,18 +52024,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/algebra.dag", 18306, 18318),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10050, 10136),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1681),
+            id: DeclarationId(1698),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(43),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(44),
-                    value: DeclarationId(865),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51015,18 +52038,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/algebra.dag", 18107, 18138),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10357, 10366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1682),
+            id: DeclarationId(1699),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(691),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(692),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51035,16 +52052,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/algebra.dag", 11495, 11507),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10371, 10379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1683),
+            id: DeclarationId(1700),
             name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(728)],
-                output: DeclarationId(128),
-                body: ArrowBody::NoBody,
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51053,24 +52066,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/list.dag", 5879, 5892),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10384, 10397),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1684),
+            id: DeclarationId(1701),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(704),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(705),
-                        value: DeclarationId(849),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(1419),
-                        value: DeclarationId(856),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51079,18 +52080,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/algebra.dag", 11488, 11535),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10402, 10419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1685),
+            id: DeclarationId(1702),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(691),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(692),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51099,16 +52094,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/algebra.dag", 11795, 11810),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10424, 10447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1686),
+            id: DeclarationId(1703),
             name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849), DeclarationId(849)],
-                output: DeclarationId(849),
-                body: ArrowBody::NoBody,
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51117,28 +52108,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/list.dag", 4183, 4196),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10452, 10471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1687),
+            id: DeclarationId(1704),
             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(1409),
-                        value: DeclarationId(860),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51147,16 +52122,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/algebra.dag", 14202, 14245),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10476, 10494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1688),
+            id: DeclarationId(1705),
             name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(850), DeclarationId(694)],
-                output: DeclarationId(850),
-                body: ArrowBody::NoBody,
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51165,28 +52136,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/list.dag", 4183, 4196),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10499, 10506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1689),
+            id: DeclarationId(1706),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(693),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(695),
-                        value: DeclarationId(850),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(1409),
-                        value: DeclarationId(886),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(694),
-                        value: DeclarationId(849),
-                    },
-                ],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(93),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51195,16 +52155,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/algebra.dag", 16911, 17021),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1690),
+            id: DeclarationId(1707),
             name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(850), DeclarationId(694)],
-                output: DeclarationId(850),
-                body: ArrowBody::NoBody,
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(93),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51213,28 +52174,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/list.dag", 4183, 4196),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1691),
+            id: DeclarationId(1708),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(693),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(695),
-                        value: DeclarationId(850),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(1409),
-                        value: DeclarationId(886),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(694),
-                        value: DeclarationId(849),
-                    },
-                ],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51243,18 +52193,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/algebra.dag", 17076, 17186),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1692),
+            id: DeclarationId(1709),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(689),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(690),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51263,16 +52207,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/algebra.dag", 22293, 22323),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11192, 11201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1693),
+            id: DeclarationId(1710),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(689),
+                template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(690),
-                    value: DeclarationId(849),
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(857),
                 }],
             },
             type_params: vec![],
@@ -51283,18 +52227,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/algebra.dag", 22275, 22324),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11687, 11725),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1694),
+            id: DeclarationId(1711),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(687),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(688),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51303,18 +52246,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/algebra.dag", 22603, 22610),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1695),
+            id: DeclarationId(1712),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(689),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(690),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(130),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51323,16 +52265,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/algebra.dag", 22737, 22789),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1696),
+            id: DeclarationId(1713),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(687),
+                template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(688),
-                    value: DeclarationId(849),
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(842),
                 }],
             },
             type_params: vec![],
@@ -51343,18 +52285,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/algebra.dag", 23140, 23147),
+            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4503, 4529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1697),
+            id: DeclarationId(1714),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(689),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(690),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(115),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51363,18 +52304,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/algebra.dag", 23118, 23148),
+            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1698),
+            id: DeclarationId(1715),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(687),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(688),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51383,18 +52323,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/algebra.dag", 23597, 23604),
+            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1699),
+            id: DeclarationId(1716),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(689),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(690),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51403,18 +52337,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/algebra.dag", 23735, 23792),
+            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1013, 1025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1700),
+            id: DeclarationId(1717),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(689),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(690),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51423,18 +52351,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/algebra.dag", 25317, 25349),
+            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1030, 1044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1701),
+            id: DeclarationId(1718),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(687),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(688),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51443,18 +52365,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/algebra.dag", 27988, 27995),
+            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1049, 1064),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1702),
+            id: DeclarationId(1719),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(689),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(690),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51463,16 +52379,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/algebra.dag", 28136, 28201),
+            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1069, 1086),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1703),
+            id: DeclarationId(1720),
             name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(850), DeclarationId(849)],
-                output: DeclarationId(850),
-                body: ArrowBody::NoBody,
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51481,28 +52393,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/list.dag", 4183, 4196),
+            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1091, 1114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1704),
+            id: DeclarationId(1721),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(693),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(695),
-                        value: DeclarationId(850),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(694),
-                        value: DeclarationId(849),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(1409),
-                        value: DeclarationId(886),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51511,18 +52407,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/algebra.dag", 28319, 28377),
+            span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4719, 4726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1705),
+            id: DeclarationId(1722),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(689),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(690),
-                    value: DeclarationId(849),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51531,16 +52421,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/algebra.dag", 28403, 28449),
+            span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4731, 4735),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1706),
+            id: DeclarationId(1723),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(687),
+                template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(688),
-                    value: DeclarationId(849),
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(869),
                 }],
             },
             type_params: vec![],
@@ -51551,46 +52441,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/algebra.dag", 28720, 28727),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1707),
-            name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1649), DeclarationId(849)],
-                output: DeclarationId(1649),
-                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),
+            span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6983, 7004),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1708),
+            id: DeclarationId(1724),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(693),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(695),
-                        value: DeclarationId(1649),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(694),
-                        value: DeclarationId(849),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(1409),
-                        value: DeclarationId(889),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51599,18 +52455,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/algebra.dag", 28708, 28749),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 360, 369),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1709),
+            id: DeclarationId(1725),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(893),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51619,17 +52469,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/anthropic_messages.dag", 4503, 4529),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 374, 381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1710),
+            id: DeclarationId(1726),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(115),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51638,17 +52483,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/anthropic_messages.dag", 4566, 4572),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 614, 618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1711),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            id: DeclarationId(1727),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51657,18 +52497,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/anthropic_messages.dag", 4589, 4596),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 623, 632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1712),
+            id: DeclarationId(1728),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1178),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51677,18 +52511,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/anthropic_operations.dag", 6546, 6561),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 910, 921),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1713),
+            id: DeclarationId(1729),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(904),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51697,17 +52525,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/anthropic_schema.dag", 2718, 2749),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 926, 935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1714),
+            id: DeclarationId(1730),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "content".to_string(),
-                    ty: DeclarationId(1713),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51716,18 +52539,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/anthropic_schema.dag", 2690, 2751),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 1166, 1173),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1715),
+            id: DeclarationId(1731),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(905),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51736,17 +52553,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/anthropic_schema.dag", 2784, 2820),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 1178, 1187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1716),
+            id: DeclarationId(1732),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "content".to_string(),
-                    ty: DeclarationId(1715),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51755,23 +52567,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/anthropic_schema.dag", 2756, 2822),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 2035, 2044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1717),
+            id: DeclarationId(1733),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "media_type".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "base64".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51780,17 +52581,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/anthropic_schema.dag", 3211, 3276),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 2049, 2065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1718),
+            id: DeclarationId(1734),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "url".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51799,17 +52595,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/anthropic_schema.dag", 3281, 3305),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 2070, 2080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1719),
+            id: DeclarationId(1735),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "text".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51818,17 +52609,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/anthropic_schema.dag", 3568, 3596),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 2085, 2099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1720),
+            id: DeclarationId(1736),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "source".to_string(),
-                    ty: DeclarationId(894),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51837,17 +52623,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/anthropic_schema.dag", 3601, 3637),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 2385, 2399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1721),
+            id: DeclarationId(1737),
             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,
@@ -51856,16 +52637,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/anthropic_schema.dag", 4332, 4354),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 2404, 2418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1722),
+            id: DeclarationId(1738),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(902),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -51876,15 +52657,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/anthropic_schema.dag", 4376, 4406),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 2818, 2830),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1723),
+            id: DeclarationId(1739),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1722),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -51895,10 +52677,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4359, 4407),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 3210, 3222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1724),
+            id: DeclarationId(1740),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51909,10 +52691,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5616, 5623),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 3694, 3708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1725),
+            id: DeclarationId(1741),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51923,14 +52705,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/anthropic_schema.dag", 5749, 5761),
+            span: SourceSpan::new("src/v3/std/computation_model.dag", 3713, 3729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1726),
+            id: DeclarationId(1742),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
-                    label: "text".to_string(),
+                    label: "value".to_string(),
                     ty: DeclarationId(230),
                 }],
             },
@@ -51942,17 +52724,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/anthropic_schema.dag", 5979, 6014),
+            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 6759, 6786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1727),
+            id: DeclarationId(1743),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "source".to_string(),
-                    ty: DeclarationId(894),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51961,17 +52738,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/anthropic_schema.dag", 6019, 6062),
+            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7611, 7616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1728),
+            id: DeclarationId(1744),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "source".to_string(),
-                    ty: DeclarationId(903),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -51980,17 +52752,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6067, 6144),
+            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7621, 7630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1729),
+            id: DeclarationId(1745),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(901),
-                }],
+                template: DeclarationId(137),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(884),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(887),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -52000,17 +52778,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/anthropic_schema.dag", 6234, 6268),
+            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 9513, 9555),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1730),
+            id: DeclarationId(1746),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(897),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1314),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52019,17 +52798,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/anthropic_schema.dag", 6286, 6323),
+            span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1234, 1254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1731),
+            id: DeclarationId(1747),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(896),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1314),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52038,34 +52818,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/anthropic_schema.dag", 6345, 6358),
+            span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1414, 1434),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1732),
+            id: DeclarationId(1748),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "source".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "title".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "content".to_string(),
-                        ty: DeclarationId(1729),
-                    },
-                    Field {
-                        label: "citations".to_string(),
-                        ty: DeclarationId(1730),
-                    },
-                    Field {
-                        label: "cache_control".to_string(),
-                        ty: DeclarationId(1731),
-                    },
-                ],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(894),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(895),
+                    value: DeclarationId(93),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -52075,15 +52838,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/anthropic_schema.dag", 6149, 6364),
+            span: SourceSpan::new("src/v3/std/lookup.dag", 4589, 4600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1733),
+            id: DeclarationId(1749),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "tool_name".to_string(),
-                    ty: DeclarationId(230),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(894),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(895),
+                    value: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -52094,17 +52858,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/anthropic_schema.dag", 6369, 6418),
+            span: SourceSpan::new("src/v3/std/lookup.dag", 4642, 4653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1734),
+            id: DeclarationId(1750),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "text".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52113,17 +52872,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/anthropic_schema.dag", 6926, 6962),
+            span: SourceSpan::new("src/v3/std/lookup.dag", 4544, 4548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1735),
+            id: DeclarationId(1751),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(898),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(895),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52132,17 +52891,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/anthropic_schema.dag", 7030, 7057),
+            span: SourceSpan::new("src/v3/std/lookup.dag", 4553, 4563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1736),
+            id: DeclarationId(1752),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(128),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(894),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(895),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52151,26 +52911,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/anthropic_schema.dag", 7074, 7079),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 10942, 10962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1737),
+            id: DeclarationId(1753),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "tool_use_id".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "content".to_string(),
-                        ty: DeclarationId(1735),
-                    },
-                    Field {
-                        label: "is_error".to_string(),
-                        ty: DeclarationId(1736),
-                    },
-                ],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(894),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(895),
+                    value: DeclarationId(905),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -52180,15 +52931,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/anthropic_schema.dag", 6967, 7085),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 11026, 11046),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1738),
+            id: DeclarationId(1754),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "text".to_string(),
-                    ty: DeclarationId(230),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(727),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(728),
+                    value: DeclarationId(905),
                 }],
             },
             type_params: vec![],
@@ -52199,26 +52951,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/anthropic_schema.dag", 7532, 7570),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 11114, 11144),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1739),
+            id: DeclarationId(1755),
             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),
-                    },
-                ],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -52228,12 +52971,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/anthropic_schema.dag", 7575, 7658),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 11611, 11629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1740),
+            id: DeclarationId(1756),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(727),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(728),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52242,12 +52991,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/anthropic_schema.dag", 8016, 8023),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 11635, 11665),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1741),
+            id: DeclarationId(1757),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52256,12 +53011,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/anthropic_schema.dag", 8028, 8037),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 14162, 14180),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1742),
+            id: DeclarationId(1758),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(727),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(728),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52270,12 +53031,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/anthropic_schema.dag", 8042, 8054),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 22217, 22247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1743),
+            id: DeclarationId(1759),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52284,12 +53051,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/anthropic_schema.dag", 8059, 8066),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 22252, 22270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1744),
+            id: DeclarationId(1760),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52298,12 +53071,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/anthropic_schema.dag", 8071, 8080),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 22530, 22548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1745),
+            id: DeclarationId(1761),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52312,12 +53091,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/anthropic_schema.dag", 8085, 8092),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 22553, 22571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1746),
+            id: DeclarationId(1762),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52326,17 +53111,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/anthropic_schema.dag", 8097, 8123),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 23044, 23062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1747),
+            id: DeclarationId(1763),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52345,17 +53131,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/anthropic_schema.dag", 8435, 8442),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 23067, 23085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1748),
+            id: DeclarationId(1764),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52364,38 +53151,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/anthropic_schema.dag", 8453, 8460),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 23186, 23204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1749),
+            id: DeclarationId(1765),
             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(1747),
-                    },
-                    Field {
-                        label: "file_id".to_string(),
-                        ty: DeclarationId(1748),
-                    },
-                    Field {
-                        label: "start_char_index".to_string(),
-                        ty: DeclarationId(93),
-                    },
-                    Field {
-                        label: "end_char_index".to_string(),
-                        ty: DeclarationId(93),
-                    },
-                ],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -52405,17 +53171,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/anthropic_schema.dag", 8363, 8506),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 23524, 23542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1750),
+            id: DeclarationId(1766),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52424,17 +53191,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/anthropic_schema.dag", 8583, 8590),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 23547, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1751),
+            id: DeclarationId(1767),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52443,38 +53211,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/anthropic_schema.dag", 8601, 8608),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 25113, 25131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1752),
+            id: DeclarationId(1768),
             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(1750),
-                    },
-                    Field {
-                        label: "file_id".to_string(),
-                        ty: DeclarationId(1751),
-                    },
-                    Field {
-                        label: "start_page_number".to_string(),
-                        ty: DeclarationId(93),
-                    },
-                    Field {
-                        label: "end_page_number".to_string(),
-                        ty: DeclarationId(93),
-                    },
-                ],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -52484,17 +53231,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/anthropic_schema.dag", 8511, 8656),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 25384, 25402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1753),
+            id: DeclarationId(1769),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52503,17 +53251,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/anthropic_schema.dag", 8741, 8748),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 25850, 25868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1754),
+            id: DeclarationId(1770),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52522,38 +53271,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/anthropic_schema.dag", 8759, 8766),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 27885, 27903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1755),
+            id: DeclarationId(1771),
             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(1753),
-                    },
-                    Field {
-                        label: "file_id".to_string(),
-                        ty: DeclarationId(1754),
-                    },
-                    Field {
-                        label: "start_block_index".to_string(),
-                        ty: DeclarationId(93),
-                    },
-                    Field {
-                        label: "end_block_index".to_string(),
-                        ty: DeclarationId(93),
-                    },
-                ],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -52563,17 +53291,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/anthropic_schema.dag", 8661, 8814),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 27933, 27951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1756),
+            id: DeclarationId(1772),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52582,30 +53311,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/anthropic_schema.dag", 8897, 8904),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 28238, 28256),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1757),
+            id: DeclarationId(1773),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "cited_text".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "encrypted_index".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "title".to_string(),
-                        ty: DeclarationId(1756),
-                    },
-                    Field {
-                        label: "url".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                ],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -52615,17 +53331,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/anthropic_schema.dag", 8819, 8919),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 28284, 28302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1758),
+            id: DeclarationId(1774),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52634,38 +53351,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/anthropic_schema.dag", 8990, 8997),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 28662, 28680),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1759),
+            id: DeclarationId(1775),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "cited_text".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "source".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "title".to_string(),
-                        ty: DeclarationId(1758),
-                    },
-                    Field {
-                        label: "search_result_index".to_string(),
-                        ty: DeclarationId(93),
-                    },
-                    Field {
-                        label: "start_block_index".to_string(),
-                        ty: DeclarationId(93),
-                    },
-                    Field {
-                        label: "end_block_index".to_string(),
-                        ty: DeclarationId(93),
-                    },
-                ],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(905),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -52675,18 +53371,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/anthropic_schema.dag", 8924, 9071),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 28685, 28703),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1760),
+            id: DeclarationId(1776),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(907),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52695,17 +53385,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/anthropic_schema.dag", 9695, 9729),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 4953, 4965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1761),
+            id: DeclarationId(1777),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1760),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52714,23 +53399,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/anthropic_schema.dag", 9695, 9730),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 4970, 4986),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1762),
+            id: DeclarationId(1778),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "text".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "citations".to_string(),
-                        ty: DeclarationId(1761),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52739,23 +53413,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/anthropic_schema.dag", 9650, 9732),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 4991, 5005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1763),
+            id: DeclarationId(1779),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "thinking".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "signature".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52764,17 +53427,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/anthropic_schema.dag", 9737, 9798),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 5855, 5868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1764),
+            id: DeclarationId(1780),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "redacted_data".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52783,17 +53441,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/anthropic_schema.dag", 9803, 9858),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 5873, 5888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1765),
+            id: DeclarationId(1781),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(130),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52802,31 +53455,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/anthropic_schema.dag", 9933, 9938),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 5893, 5909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1766),
+            id: DeclarationId(1782),
             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(1765),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52835,14 +53469,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/anthropic_schema.dag", 9863, 9940),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 5914, 5927),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1767),
+            id: DeclarationId(1783),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(130),
+                    DeclarationId(898),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -52854,31 +53488,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/anthropic_schema.dag", 10038, 10043),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1768),
+            id: DeclarationId(1784),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "id".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(909),
-                    },
-                    Field {
-                        label: "input".to_string(),
-                        ty: DeclarationId(130),
-                    },
-                    Field {
-                        label: "caller".to_string(),
-                        ty: DeclarationId(1767),
-                    },
-                ],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(899),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52887,14 +53507,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/anthropic_schema.dag", 9945, 10045),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1769),
+            id: DeclarationId(1785),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(130),
+                    DeclarationId(93),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -52906,27 +53526,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/anthropic_schema.dag", 10129, 10134),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1770),
+            id: DeclarationId(1786),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "tool_use_id".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "content".to_string(),
-                        ty: DeclarationId(130),
-                    },
-                    Field {
-                        label: "caller".to_string(),
-                        ty: DeclarationId(1769),
-                    },
-                ],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52935,10 +53545,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10050, 10136),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1771),
+            id: DeclarationId(1787),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52949,12 +53559,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/anthropic_schema.dag", 10357, 10366),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 8405, 8414),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1772),
+            id: DeclarationId(1788),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "previous".to_string(),
+                    ty: DeclarationId(904),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52963,12 +53578,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/anthropic_schema.dag", 10371, 10379),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 8419, 8465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1773),
+            id: DeclarationId(1789),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(93),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52977,12 +53597,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/anthropic_schema.dag", 10384, 10397),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 9506, 9523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1774),
+            id: DeclarationId(1790),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(901),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -52991,12 +53616,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10402, 10419),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 9528, 9552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1775),
+            id: DeclarationId(1791),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "var".to_string(),
+                        ty: DeclarationId(901),
+                    },
+                    Field {
+                        label: "degree".to_string(),
+                        ty: DeclarationId(904),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53005,12 +53641,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/anthropic_schema.dag", 10424, 10447),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 9557, 9619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1776),
+            id: DeclarationId(1792),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(727),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(728),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53019,12 +53661,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/anthropic_schema.dag", 10452, 10471),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 9636, 9666),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1777),
+            id: DeclarationId(1793),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(1792),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53033,12 +53680,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/anthropic_schema.dag", 10476, 10494),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 9624, 9667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1778),
+            id: DeclarationId(1794),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(727),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(728),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53047,17 +53700,36 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10499, 10506),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 9680, 9710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1779),
+            id: DeclarationId(1795),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(1794),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: 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", 9672, 9711),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1796),
+            name: None,
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(901),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53066,17 +53738,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/anthropic_schema.dag", 10756, 10760),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 9716, 9737),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1780),
+            id: DeclarationId(1797),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53085,17 +53757,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/anthropic_schema.dag", 10792, 10796),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 9742, 9761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1781),
+            id: DeclarationId(1798),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(31),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(32),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53104,10 +53777,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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/algebra.dag", 9479, 9501),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1782),
+            id: DeclarationId(1799),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53118,18 +53791,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/anthropic_schema.dag", 11192, 11201),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 18143, 18156),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1783),
+            id: DeclarationId(1800),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(908),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53138,17 +53805,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/anthropic_schema.dag", 11687, 11725),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 18161, 18169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1784),
+            id: DeclarationId(1801),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53157,17 +53819,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/anthropic_schema.dag", 11804, 11811),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 18174, 18185),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1785),
+            id: DeclarationId(1802),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(130),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53176,10 +53833,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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/algebra.dag", 18190, 18207),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1786),
+            id: DeclarationId(1803),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53190,12 +53847,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/bootstrap_authority.dag", 1013, 1025),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 18212, 18226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1787),
+            id: DeclarationId(1804),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "degree".to_string(),
+                    ty: DeclarationId(1132),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53204,10 +53866,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1030, 1044),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 18231, 18280),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1788),
+            id: DeclarationId(1805),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53218,10 +53880,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1049, 1064),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 18285, 18301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1789),
+            id: DeclarationId(1806),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53232,12 +53894,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/bootstrap_authority.dag", 1069, 1086),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 18306, 18318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1790),
+            id: DeclarationId(1807),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(43),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(44),
+                    value: DeclarationId(921),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53246,12 +53914,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/bootstrap_authority.dag", 1091, 1114),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 18107, 18138),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1791),
+            id: DeclarationId(1808),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(691),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(692),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53260,12 +53934,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/bridge_ledger.dag", 4719, 4726),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1792),
+            id: DeclarationId(1809),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(728)],
+                output: DeclarationId(128),
+                body: ArrowBody::NoBody,
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53274,17 +53952,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4731, 4735),
+            span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1793),
+            id: DeclarationId(1810),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(919),
-                }],
+                template: DeclarationId(704),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(705),
+                        value: DeclarationId(905),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1433),
+                        value: DeclarationId(912),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -53294,12 +53978,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/bridge_ledger.dag", 6983, 7004),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1794),
+            id: DeclarationId(1811),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(691),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(692),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53308,12 +53998,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/clean_emission.dag", 2224, 2238),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1795),
+            id: DeclarationId(1812),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(905), DeclarationId(905)],
+                output: DeclarationId(905),
+                body: ArrowBody::NoBody,
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53322,12 +54016,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/clean_emission.dag", 2243, 2268),
+            span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1796),
+            id: DeclarationId(1813),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(693),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(695),
+                        value: DeclarationId(905),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(694),
+                        value: DeclarationId(905),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1423),
+                        value: DeclarationId(916),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53336,12 +54046,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/clean_emission.dag", 2273, 2283),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1797),
+            id: DeclarationId(1814),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(906), DeclarationId(694)],
+                output: DeclarationId(906),
+                body: ArrowBody::NoBody,
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53350,12 +54064,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/clean_emission.dag", 2548, 2565),
+            span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1798),
+            id: DeclarationId(1815),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(693),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(695),
+                        value: DeclarationId(906),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1423),
+                        value: DeclarationId(942),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(694),
+                        value: DeclarationId(905),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53364,12 +54094,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/clean_emission.dag", 2570, 2594),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1799),
+            id: DeclarationId(1816),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(906), DeclarationId(694)],
+                output: DeclarationId(906),
+                body: ArrowBody::NoBody,
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53378,12 +54112,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/clean_emission.dag", 2599, 2631),
+            span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1800),
+            id: DeclarationId(1817),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(693),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(695),
+                        value: DeclarationId(906),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1423),
+                        value: DeclarationId(942),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(694),
+                        value: DeclarationId(905),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53392,12 +54142,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/clean_emission.dag", 2636, 2663),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1801),
+            id: DeclarationId(1818),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(689),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(690),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53406,12 +54162,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/clean_emission.dag", 3369, 3393),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1802),
+            id: DeclarationId(1819),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(689),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(690),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53420,12 +54182,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/clean_emission.dag", 3398, 3430),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1803),
+            id: DeclarationId(1820),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(687),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(688),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53434,12 +54202,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/clean_emission.dag", 3564, 3588),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1804),
+            id: DeclarationId(1821),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(689),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(690),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53448,12 +54222,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/clean_emission.dag", 3593, 3614),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1805),
+            id: DeclarationId(1822),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(687),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(688),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53462,12 +54242,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/clean_emission.dag", 3619, 3637),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1806),
+            id: DeclarationId(1823),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(689),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(690),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53476,12 +54262,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/clean_emission.dag", 3781, 3796),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1807),
+            id: DeclarationId(1824),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(687),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(688),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53490,12 +54282,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/clean_emission.dag", 3801, 3831),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1808),
+            id: DeclarationId(1825),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(689),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(690),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53504,12 +54302,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/clean_emission.dag", 3836, 3857),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1809),
+            id: DeclarationId(1826),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(689),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(690),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53518,12 +54322,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/clean_emission.dag", 4024, 4044),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1810),
+            id: DeclarationId(1827),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(687),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(688),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53532,12 +54342,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/clean_emission.dag", 4049, 4076),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1811),
+            id: DeclarationId(1828),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(689),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(690),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53546,12 +54362,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/clean_emission.dag", 4081, 4095),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1812),
+            id: DeclarationId(1829),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(906), DeclarationId(905)],
+                output: DeclarationId(906),
+                body: ArrowBody::NoBody,
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53560,12 +54380,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/clean_emission.dag", 4354, 4362),
+            span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1813),
+            id: DeclarationId(1830),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(693),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(695),
+                        value: DeclarationId(906),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(694),
+                        value: DeclarationId(905),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1423),
+                        value: DeclarationId(942),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53574,12 +54410,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/clean_emission.dag", 4367, 4393),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1814),
+            id: DeclarationId(1831),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(689),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(690),
+                    value: DeclarationId(905),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53588,16 +54430,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/clean_emission.dag", 4398, 4423),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1815),
+            id: DeclarationId(1832),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
+                template: DeclarationId(687),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(230),
+                    parameter: DeclarationId(688),
+                    value: DeclarationId(905),
                 }],
             },
             type_params: vec![],
@@ -53608,12 +54450,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/clean_emission.dag", 5320, 5332),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1816),
+            id: DeclarationId(1833),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1775), DeclarationId(905)],
+                output: DeclarationId(1775),
+                body: ArrowBody::NoBody,
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53622,12 +54468,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/clean_emission.dag", 5693, 5713),
+            span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1817),
+            id: DeclarationId(1834),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(693),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(695),
+                        value: DeclarationId(1775),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(694),
+                        value: DeclarationId(905),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1423),
+                        value: DeclarationId(945),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53636,12 +54498,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/clean_emission.dag", 5718, 5736),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1818),
+            id: DeclarationId(1835),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(137),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(949),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53650,12 +54524,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/clean_emission.dag", 5741, 5759),
+            span: SourceSpan::new("src/v3/std/services.dag", 6784, 6807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1819),
+            id: DeclarationId(1836),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(952),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -53664,14 +54544,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/clean_emission.dag", 5764, 5791),
+            span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6546, 6561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1820),
+            id: DeclarationId(1837),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(935),
+                    DeclarationId(956),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -53686,7 +54566,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(1821),
+            id: DeclarationId(1838),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53705,7 +54585,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(1822),
+            id: DeclarationId(1839),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53724,7 +54604,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(1823),
+            id: DeclarationId(1840),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53743,11 +54623,11 @@ 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(1824),
+            id: DeclarationId(1841),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(946),
+                    DeclarationId(967),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -53762,11 +54642,11 @@ 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(1825),
+            id: DeclarationId(1842),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(946),
+                    DeclarationId(967),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -53781,7 +54661,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(1826),
+            id: DeclarationId(1843),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53800,7 +54680,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(1827),
+            id: DeclarationId(1844),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53819,7 +54699,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(1828),
+            id: DeclarationId(1845),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53838,7 +54718,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(1829),
+            id: DeclarationId(1846),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53857,7 +54737,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(1830),
+            id: DeclarationId(1847),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53876,7 +54756,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(1831),
+            id: DeclarationId(1848),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53890,12 +54770,12 @@ 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(1832),
+            id: DeclarationId(1849),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "steps".to_string(),
-                    ty: DeclarationId(1205),
+                    ty: DeclarationId(1132),
                 }],
             },
             type_params: vec![],
@@ -53909,7 +54789,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(1833),
+            id: DeclarationId(1850),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53923,7 +54803,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(1834),
+            id: DeclarationId(1851),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53942,13 +54822,13 @@ 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(1835),
+            id: DeclarationId(1852),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "amount".to_string(),
-                        ty: DeclarationId(1205),
+                        ty: DeclarationId(1132),
                     },
                     Field {
                         label: "collection".to_string(),
@@ -53967,13 +54847,13 @@ 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(1836),
+            id: DeclarationId(1853),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "steps".to_string(),
-                        ty: DeclarationId(1205),
+                        ty: DeclarationId(1132),
                     },
                     Field {
                         label: "ring_param".to_string(),
@@ -53992,13 +54872,13 @@ 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(1837),
+            id: DeclarationId(1854),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "divisor".to_string(),
-                        ty: DeclarationId(1207),
+                        ty: DeclarationId(1134),
                     },
                     Field {
                         label: "ring_param".to_string(),
@@ -54017,7 +54897,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(1838),
+            id: DeclarationId(1855),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54036,7 +54916,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(1839),
+            id: DeclarationId(1856),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54055,7 +54935,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(1840),
+            id: DeclarationId(1857),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54074,7 +54954,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(1841),
+            id: DeclarationId(1858),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54088,7 +54968,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(1842),
+            id: DeclarationId(1859),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54102,12 +54982,12 @@ 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(1843),
+            id: DeclarationId(1860),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "steps".to_string(),
-                    ty: DeclarationId(1205),
+                    ty: DeclarationId(1132),
                 }],
             },
             type_params: vec![],
@@ -54121,12 +55001,12 @@ 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(1844),
+            id: DeclarationId(1861),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "divisor".to_string(),
-                    ty: DeclarationId(1207),
+                    ty: DeclarationId(1134),
                 }],
             },
             type_params: vec![],
@@ -54140,7 +55020,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(1845),
+            id: DeclarationId(1862),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54154,7 +55034,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(1846),
+            id: DeclarationId(1863),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54168,7 +55048,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(1847),
+            id: DeclarationId(1864),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54182,11 +55062,11 @@ 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(1848),
+            id: DeclarationId(1865),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(938),
+                    DeclarationId(959),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -54201,7 +55081,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(1849),
+            id: DeclarationId(1866),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54215,7 +55095,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(1850),
+            id: DeclarationId(1867),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54229,7 +55109,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(1851),
+            id: DeclarationId(1868),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54243,7 +55123,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(1852),
+            id: DeclarationId(1869),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54254,12 +55134,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/computation_model.dag", 360, 369),
+            span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3709, 3721),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1853),
+            id: DeclarationId(1870),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "value".to_string(),
+                    ty: DeclarationId(159),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -54268,12 +55153,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/computation_model.dag", 374, 381),
+            span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3726, 3762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1854),
+            id: DeclarationId(1871),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(976),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -54282,10 +55173,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 614, 618),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 855, 873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1855),
+            id: DeclarationId(1872),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54296,12 +55187,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/computation_model.dag", 623, 632),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 4373, 4389),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1856),
+            id: DeclarationId(1873),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(788),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -54310,10 +55206,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 910, 921),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 4394, 4422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1857),
+            id: DeclarationId(1874),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54324,12 +55220,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/computation_model.dag", 926, 935),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 4665, 4686),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1858),
+            id: DeclarationId(1875),
             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,
@@ -54338,12 +55239,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/computation_model.dag", 1166, 1173),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 5176, 5195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1859),
+            id: DeclarationId(1876),
             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,
@@ -54352,12 +55258,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/computation_model.dag", 1178, 1187),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 5200, 5222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1860),
+            id: DeclarationId(1877),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(981),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -54366,10 +55278,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 2035, 2044),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 5591, 5614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1861),
+            id: DeclarationId(1878),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54380,10 +55292,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 2049, 2065),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 6611, 6619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1862),
+            id: DeclarationId(1879),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54394,10 +55306,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 2070, 2080),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 6624, 6632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1863),
+            id: DeclarationId(1880),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54408,10 +55320,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 2085, 2099),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 7073, 7078),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1864),
+            id: DeclarationId(1881),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54422,10 +55334,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 2385, 2399),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 7083, 7091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1865),
+            id: DeclarationId(1882),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54436,18 +55348,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/computation_model.dag", 2404, 2418),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 7427, 7440),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1866),
+            id: DeclarationId(1883),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -54456,18 +55362,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/computation_model.dag", 2818, 2830),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 7445, 7451),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1867),
+            id: DeclarationId(1884),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -54476,10 +55376,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 3210, 3222),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 7709, 7717),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1868),
+            id: DeclarationId(1885),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54490,10 +55390,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation_model.dag", 3694, 3708),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 7722, 7727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1869),
+            id: DeclarationId(1886),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54504,17 +55404,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/computation_model.dag", 3713, 3729),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 7732, 7745),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1870),
+            id: DeclarationId(1887),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "value".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -54523,10 +55418,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 6759, 6786),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 8082, 8100),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1871),
+            id: DeclarationId(1888),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54537,10 +55432,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7611, 7616),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 9475, 9484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1872),
+            id: DeclarationId(1889),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54551,24 +55446,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/coproduct_projection.dag", 7621, 7630),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 9489, 9502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1873),
+            id: DeclarationId(1890),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(137),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(138),
-                        value: DeclarationId(962),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(139),
-                        value: DeclarationId(965),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -54577,10 +55460,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 9513, 9555),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 9507, 9515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1874),
+            id: DeclarationId(1891),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54591,10 +55474,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3853, 3857),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 9520, 9530),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1875),
+            id: DeclarationId(1892),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54605,10 +55488,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3860, 3864),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 9535, 9545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1876),
+            id: DeclarationId(1893),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54619,10 +55502,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3867, 3871),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 9550, 9561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1877),
+            id: DeclarationId(1894),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54633,10 +55516,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3874, 3879),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 9566, 9574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1878),
+            id: DeclarationId(1895),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54647,10 +55530,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3882, 3893),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 9579, 9586),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1879),
+            id: DeclarationId(1896),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54661,10 +55544,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3896, 3909),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 9591, 9601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1880),
+            id: DeclarationId(1897),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54675,10 +55558,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4489, 4494),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 9606, 9618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1881),
+            id: DeclarationId(1898),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54689,10 +55572,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4497, 4506),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 12311, 12337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1882),
+            id: DeclarationId(1899),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54703,10 +55586,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4509, 4515),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 12342, 12352),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1883),
+            id: DeclarationId(1900),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54717,10 +55600,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4518, 4522),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 17117, 17123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1884),
+            id: DeclarationId(1901),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54731,18 +55614,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/cross_target_coverage.dag", 4525, 4529),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 17128, 17139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1885),
+            id: DeclarationId(1902),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(974),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -54751,18 +55628,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/cross_target_coverage.dag", 5923, 5941),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 17459, 17470),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1886),
+            id: DeclarationId(1903),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(975),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -54771,10 +55642,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6396, 6424),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 17475, 17486),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1887),
+            id: DeclarationId(1904),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54785,10 +55656,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1099, 1113),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 19419, 19430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1888),
+            id: DeclarationId(1905),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54799,10 +55670,54 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1118, 1128),
+            span: SourceSpan::new("src/v3/std/emit_model.dag", 19435, 19443),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1889),
+            id: DeclarationId(1906),
+            name: None,
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "template".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", 20606, 20641),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1907),
+            name: None,
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "inline_template".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "fn_ref_template".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", 20646, 20734),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1908),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54813,10 +55728,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1133, 1145),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 2224, 2238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1890),
+            id: DeclarationId(1909),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54827,10 +55742,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1150, 1163),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 2243, 2268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1891),
+            id: DeclarationId(1910),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54841,10 +55756,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1168, 1180),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 2273, 2283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1892),
+            id: DeclarationId(1911),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54855,10 +55770,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1185, 1197),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 2548, 2565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1893),
+            id: DeclarationId(1912),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54869,10 +55784,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1202, 1224),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 2570, 2594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1894),
+            id: DeclarationId(1913),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54883,10 +55798,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1229, 1248),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 2599, 2631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1895),
+            id: DeclarationId(1914),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54897,10 +55812,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1253, 1278),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 2636, 2663),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1896),
+            id: DeclarationId(1915),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54911,17 +55826,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/diagnostics.dag", 1283, 1306),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3369, 3393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1897),
+            id: DeclarationId(1916),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(977),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -54930,17 +55840,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/diagnostics.dag", 5506, 5542),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3398, 3430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1898),
+            id: DeclarationId(1917),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(980),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -54949,18 +55854,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/diagnostics.dag", 5547, 5588),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3564, 3588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1899),
+            id: DeclarationId(1918),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(978),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -54969,17 +55868,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/diagnostics.dag", 6047, 6063),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3593, 3614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1900),
+            id: DeclarationId(1919),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "unspecified_axis".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -54988,10 +55882,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9175, 9216),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3619, 3637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1901),
+            id: DeclarationId(1920),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55002,18 +55896,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/diagnostics.dag", 9513, 9525),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3781, 3796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1902),
+            id: DeclarationId(1921),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55022,23 +55910,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/diagnostics.dag", 9795, 9807),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3801, 3831),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1903),
+            id: DeclarationId(1922),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "binding".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "sites".to_string(),
-                        ty: DeclarationId(1902),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55047,17 +55924,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/diagnostics.dag", 9752, 9809),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 3836, 3857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1904),
+            id: DeclarationId(1923),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "construct".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55066,17 +55938,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/diagnostics.dag", 10119, 10153),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 4024, 4044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1905),
+            id: DeclarationId(1924),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "detail".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55085,10 +55952,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10556, 10607),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 4049, 4076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1906),
+            id: DeclarationId(1925),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55099,27 +55966,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/diagnostics.dag", 10950, 10968),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 4081, 4095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1907),
+            id: DeclarationId(1926),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "connective".to_string(),
-                        ty: DeclarationId(971),
-                    },
-                    Field {
-                        label: "behavior".to_string(),
-                        ty: DeclarationId(972),
-                    },
-                    Field {
-                        label: "target".to_string(),
-                        ty: DeclarationId(967),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55128,18 +55980,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/diagnostics.dag", 11357, 11469),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 4354, 4362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1908),
+            id: DeclarationId(1927),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(37),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(38),
-                    value: DeclarationId(1003),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55148,24 +55994,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/dimensions.dag", 4846, 4866),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 4367, 4393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1909),
+            id: DeclarationId(1928),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1002),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1003),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55174,23 +56008,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/dimensions.dag", 4876, 4900),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 4398, 4423),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1910),
+            id: DeclarationId(1929),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1002),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1003),
-                    },
-                ],
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(230),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -55200,24 +56028,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/dimensions.dag", 4911, 4935),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 5320, 5332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1911),
+            id: DeclarationId(1930),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1002),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1003),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55226,18 +56042,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/dimensions.dag", 4941, 4965),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 5693, 5713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1912),
+            id: DeclarationId(1931),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(37),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(38),
-                    value: DeclarationId(1006),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55246,24 +56056,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/dimensions.dag", 5042, 5062),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 5718, 5736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1913),
+            id: DeclarationId(1932),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1005),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1006),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55272,24 +56070,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/dimensions.dag", 5072, 5096),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 5741, 5759),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1914),
+            id: DeclarationId(1933),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1005),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1006),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55298,24 +56084,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/dimensions.dag", 5107, 5131),
+            span: SourceSpan::new("src/v3/std/clean_emission.dag", 5764, 5791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1915),
+            id: DeclarationId(1934),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1005),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1006),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55324,18 +56098,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/dimensions.dag", 5137, 5161),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3853, 3857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1916),
+            id: DeclarationId(1935),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(37),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(38),
-                    value: DeclarationId(1009),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55344,24 +56112,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/dimensions.dag", 5245, 5265),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3860, 3864),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1917),
+            id: DeclarationId(1936),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1008),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1009),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55370,24 +56126,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/dimensions.dag", 5276, 5300),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3867, 3871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1918),
+            id: DeclarationId(1937),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1008),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1009),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55396,18 +56140,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/dimensions.dag", 5325, 5349),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3874, 3879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1919),
+            id: DeclarationId(1938),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(37),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(38),
-                    value: DeclarationId(1012),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55416,24 +56154,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/dimensions.dag", 5440, 5460),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3882, 3893),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1920),
+            id: DeclarationId(1939),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1011),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1012),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55442,24 +56168,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/dimensions.dag", 5471, 5495),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3896, 3909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1921),
+            id: DeclarationId(1940),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1011),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1012),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55468,17 +56182,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/dimensions.dag", 5520, 5544),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4489, 4494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1922),
+            id: DeclarationId(1941),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(985),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55487,23 +56196,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/dimensions.dag", 1634, 1651),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4497, 4506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1923),
+            id: DeclarationId(1942),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "reason".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "at".to_string(),
-                        ty: DeclarationId(827),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55512,10 +56210,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 1656, 1697),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4509, 4515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1924),
+            id: DeclarationId(1943),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55526,17 +56224,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/dimensions.dag", 1879, 1891),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4518, 4522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1925),
+            id: DeclarationId(1944),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "value".to_string(),
-                    ty: DeclarationId(982),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55545,16 +56238,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/dimensions.dag", 1896, 1932),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4525, 4529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1926),
+            id: DeclarationId(1945),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
+                template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(988),
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1031),
                 }],
             },
             type_params: vec![],
@@ -55565,16 +56258,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/dimensions.dag", 2414, 2430),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5923, 5941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1927),
+            id: DeclarationId(1946),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1926),
+                    value: DeclarationId(1032),
                 }],
             },
             type_params: vec![],
@@ -55585,27 +56278,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/dimensions.dag", 2409, 2431),
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6396, 6424),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1928),
+            id: DeclarationId(1947),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "dimension_name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "composed".to_string(),
-                        ty: DeclarationId(988),
-                    },
-                    Field {
-                        label: "witnesses".to_string(),
-                        ty: DeclarationId(1927),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55614,18 +56292,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/dimensions.dag", 2325, 2437),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1099, 1113),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1929),
+            id: DeclarationId(1948),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(982),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55634,18 +56306,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/dimensions.dag", 2505, 2521),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1118, 1128),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1930),
+            id: DeclarationId(1949),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(988),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55654,18 +56320,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/dimensions.dag", 2544, 2560),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1133, 1145),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1931),
+            id: DeclarationId(1950),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1930),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55674,27 +56334,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/dimensions.dag", 2539, 2561),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1150, 1163),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1932),
+            id: DeclarationId(1951),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "dimension_name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "violations".to_string(),
-                        ty: DeclarationId(1929),
-                    },
-                    Field {
-                        label: "witnesses".to_string(),
-                        ty: DeclarationId(1931),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55703,18 +56348,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/dimensions.dag", 2442, 2567),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1168, 1180),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1933),
+            id: DeclarationId(1952),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(990),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55723,16 +56362,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/dimensions.dag", 3902, 3918),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1185, 1197),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1934),
+            id: DeclarationId(1953),
             name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(1933),
-                body: ArrowBody::NoBody,
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55741,18 +56376,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/dimensions.dag", 3881, 3918),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1202, 1224),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1935),
+            id: DeclarationId(1954),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(19),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(20),
-                    value: DeclarationId(990),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55761,16 +56390,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/dimensions.dag", 3930, 3945),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1229, 1248),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1936),
+            id: DeclarationId(1955),
             name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(827), DeclarationId(990)],
-                output: DeclarationId(986),
-                body: ArrowBody::NoBody,
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55779,18 +56404,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/dimensions.dag", 3966, 4009),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1253, 1278),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1937),
-            name: Some("DimensionUnitAbelianGroup".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(25),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(26),
-                    value: DeclarationId(992),
-                }],
-            },
+            id: DeclarationId(1956),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55799,12 +56418,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/dimensions.dag", 4652, 4702),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1283, 1306),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1938),
+            id: DeclarationId(1957),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(1034),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55813,15 +56437,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/emission_provenance.dag", 3709, 3721),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5506, 5542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1939),
+            id: DeclarationId(1958),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
-                    label: "value".to_string(),
-                    ty: DeclarationId(159),
+                    label: "_0".to_string(),
+                    ty: DeclarationId(1037),
                 }],
             },
             type_params: vec![],
@@ -55832,16 +56456,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/emission_provenance.dag", 3726, 3762),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5547, 5588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1940),
+            id: DeclarationId(1959),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1019),
+                    value: DeclarationId(1035),
                 }],
             },
             type_params: vec![],
@@ -55852,10 +56476,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 855, 873),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 6047, 6063),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1941),
+            id: DeclarationId(1960),
+            name: None,
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "unspecified_axis".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/diagnostics.dag", 9175, 9216),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1961),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55866,15 +56509,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/emit_model.dag", 4373, 4389),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9513, 9525),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1942),
+            id: DeclarationId(1962),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(788),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -55885,12 +56529,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 4394, 4422),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9795, 9807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1943),
+            id: DeclarationId(1963),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "binding".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "sites".to_string(),
+                        ty: DeclarationId(1962),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55899,14 +56554,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/emit_model.dag", 4665, 4686),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9752, 9809),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1944),
+            id: DeclarationId(1964),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
-                    label: "_0".to_string(),
+                    label: "construct".to_string(),
                     ty: DeclarationId(230),
                 }],
             },
@@ -55918,14 +56573,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/emit_model.dag", 5176, 5195),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10119, 10153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1945),
+            id: DeclarationId(1965),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
-                    label: "_0".to_string(),
+                    label: "detail".to_string(),
                     ty: DeclarationId(230),
                 }],
             },
@@ -55937,17 +56592,40 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 5200, 5222),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10556, 10607),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1946),
+            id: DeclarationId(1966),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1024),
-                }],
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10950, 10968),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1967),
+            name: None,
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "connective".to_string(),
+                        ty: DeclarationId(1028),
+                    },
+                    Field {
+                        label: "behavior".to_string(),
+                        ty: DeclarationId(1029),
+                    },
+                    Field {
+                        label: "target".to_string(),
+                        ty: DeclarationId(1024),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -55957,12 +56635,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/emit_model.dag", 5591, 5614),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 11357, 11469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1947),
+            id: DeclarationId(1968),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(37),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(38),
+                    value: DeclarationId(1060),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55971,12 +56655,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/emit_model.dag", 6611, 6619),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4846, 4866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1948),
+            id: DeclarationId(1969),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1048),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1049),
+                        value: DeclarationId(1059),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1050),
+                        value: DeclarationId(1060),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55985,12 +56681,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/emit_model.dag", 6624, 6632),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4876, 4900),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1949),
+            id: DeclarationId(1970),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1048),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1049),
+                        value: DeclarationId(1059),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1050),
+                        value: DeclarationId(1060),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -55999,12 +56707,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/emit_model.dag", 7073, 7078),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4911, 4935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1950),
+            id: DeclarationId(1971),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1048),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1049),
+                        value: DeclarationId(1059),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1050),
+                        value: DeclarationId(1060),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56013,12 +56733,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/emit_model.dag", 7083, 7091),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4941, 4965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1951),
+            id: DeclarationId(1972),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(37),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(38),
+                    value: DeclarationId(1063),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56027,12 +56753,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/emit_model.dag", 7427, 7440),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5042, 5062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1952),
+            id: DeclarationId(1973),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1048),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1049),
+                        value: DeclarationId(1062),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1050),
+                        value: DeclarationId(1063),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56041,12 +56779,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/emit_model.dag", 7445, 7451),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5072, 5096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1953),
+            id: DeclarationId(1974),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1048),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1049),
+                        value: DeclarationId(1062),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1050),
+                        value: DeclarationId(1063),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56055,12 +56805,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/emit_model.dag", 7709, 7717),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5107, 5131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1954),
+            id: DeclarationId(1975),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1048),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1049),
+                        value: DeclarationId(1062),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1050),
+                        value: DeclarationId(1063),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56069,12 +56831,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/emit_model.dag", 7722, 7727),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5137, 5161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1955),
+            id: DeclarationId(1976),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(37),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(38),
+                    value: DeclarationId(1066),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56083,12 +56851,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/emit_model.dag", 7732, 7745),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5245, 5265),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1956),
+            id: DeclarationId(1977),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1048),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1049),
+                        value: DeclarationId(1065),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1050),
+                        value: DeclarationId(1066),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56097,12 +56877,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/emit_model.dag", 8082, 8100),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5276, 5300),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1957),
+            id: DeclarationId(1978),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1048),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1049),
+                        value: DeclarationId(1065),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1050),
+                        value: DeclarationId(1066),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56111,12 +56903,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/emit_model.dag", 9475, 9484),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5325, 5349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1958),
+            id: DeclarationId(1979),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(37),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(38),
+                    value: DeclarationId(1069),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56125,12 +56923,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/emit_model.dag", 9489, 9502),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5440, 5460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1959),
+            id: DeclarationId(1980),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1048),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1049),
+                        value: DeclarationId(1068),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1050),
+                        value: DeclarationId(1069),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56139,12 +56949,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/emit_model.dag", 9507, 9515),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5471, 5495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1960),
+            id: DeclarationId(1981),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1048),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1049),
+                        value: DeclarationId(1068),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1050),
+                        value: DeclarationId(1069),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56153,12 +56975,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/emit_model.dag", 9520, 9530),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5520, 5544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1961),
+            id: DeclarationId(1982),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(1042),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56167,12 +56994,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 9535, 9545),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 1634, 1651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1962),
+            id: DeclarationId(1983),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "reason".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "at".to_string(),
+                        ty: DeclarationId(827),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56181,10 +57019,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 9550, 9561),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 1656, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1963),
+            id: DeclarationId(1984),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56195,12 +57033,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/emit_model.dag", 9566, 9574),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 1879, 1891),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1964),
+            id: DeclarationId(1985),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "value".to_string(),
+                    ty: DeclarationId(1039),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56209,12 +57052,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/emit_model.dag", 9579, 9586),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 1896, 1932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1965),
+            id: DeclarationId(1986),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1041),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1045),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56223,12 +57072,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/emit_model.dag", 9591, 9601),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 2414, 2430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1966),
+            id: DeclarationId(1987),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1986),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56237,12 +57092,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 9606, 9618),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 2409, 2431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1967),
+            id: DeclarationId(1988),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "dimension_name".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "composed".to_string(),
+                        ty: DeclarationId(1045),
+                    },
+                    Field {
+                        label: "witnesses".to_string(),
+                        ty: DeclarationId(1987),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56251,12 +57121,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/emit_model.dag", 12311, 12337),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 2325, 2437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1968),
+            id: DeclarationId(1989),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1039),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56265,12 +57141,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/emit_model.dag", 12342, 12352),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 2505, 2521),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1969),
+            id: DeclarationId(1990),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1041),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1045),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56279,12 +57161,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/emit_model.dag", 17117, 17123),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 2544, 2560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1970),
+            id: DeclarationId(1991),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1990),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56293,12 +57181,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/emit_model.dag", 17128, 17139),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 2539, 2561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1971),
+            id: DeclarationId(1992),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "dimension_name".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "violations".to_string(),
+                        ty: DeclarationId(1989),
+                    },
+                    Field {
+                        label: "witnesses".to_string(),
+                        ty: DeclarationId(1991),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56307,12 +57210,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/emit_model.dag", 17459, 17470),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 2442, 2567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1972),
+            id: DeclarationId(1993),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1041),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1047),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56321,12 +57230,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/emit_model.dag", 17475, 17486),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 3902, 3918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1973),
+            id: DeclarationId(1994),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(827)],
+                output: DeclarationId(1993),
+                body: ArrowBody::NoBody,
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56335,12 +57248,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/emit_model.dag", 19419, 19430),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 3881, 3918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1974),
+            id: DeclarationId(1995),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(19),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(20),
+                    value: DeclarationId(1047),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56349,16 +57268,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/emit_model.dag", 19435, 19443),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 3930, 3945),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1975),
+            id: DeclarationId(1996),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "template".to_string(),
-                    ty: DeclarationId(230),
-                }],
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(827), DeclarationId(1047)],
+                output: DeclarationId(1043),
+                body: ArrowBody::NoBody,
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -56368,22 +57286,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/emit_model.dag", 20606, 20641),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 3966, 4009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1976),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "inline_template".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "fn_ref_template".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                ],
+            id: DeclarationId(1997),
+            name: Some("DimensionUnitAbelianGroup".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(25),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(26),
+                    value: DeclarationId(1049),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -56393,16 +57306,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/emit_model.dag", 20646, 20734),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1977),
+            id: DeclarationId(1998),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1054),
+                    value: DeclarationId(1011),
                 }],
             },
             type_params: vec![],
@@ -56416,14 +57329,15 @@ 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(1978),
+            id: DeclarationId(1999),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(935),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1041),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1081),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56432,17 +57346,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/induction.dag", 20558, 20570),
+            span: SourceSpan::new("src/v3/std/lens.dag", 4180, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1979),
+            id: DeclarationId(2000),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(940),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(827)],
+                output: DeclarationId(1999),
+                body: ArrowBody::NoBody,
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56451,16 +57364,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/induction.dag", 21943, 21958),
+            span: SourceSpan::new("src/v3/std/lens.dag", 4159, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1980),
+            id: DeclarationId(2001),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
+                template: DeclarationId(19),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1085),
+                    parameter: DeclarationId(20),
+                    value: DeclarationId(1081),
                 }],
             },
             type_params: vec![],
@@ -56471,17 +57384,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/induction.dag", 27850, 27865),
+            span: SourceSpan::new("src/v3/std/lens.dag", 4205, 4214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1981),
+            id: DeclarationId(2002),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1084),
-                }],
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1081), DeclarationId(1081)],
+                output: DeclarationId(1081),
+                body: ArrowBody::NoBody,
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -56491,17 +57402,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/induction.dag", 29879, 29895),
+            span: SourceSpan::new("src/v3/std/lens.dag", 4225, 4238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1982),
+            id: DeclarationId(2003),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1084),
-                }],
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1081), DeclarationId(818)],
+                output: DeclarationId(1081),
+                body: ArrowBody::NoBody,
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -56511,17 +57420,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/induction.dag", 29988, 30004),
+            span: SourceSpan::new("src/v3/std/lens.dag", 4250, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1983),
+            id: DeclarationId(2004),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1084),
-                }],
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(828), DeclarationId(1081)],
+                output: DeclarationId(1043),
+                body: ArrowBody::NoBody,
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -56531,16 +57438,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/induction.dag", 30102, 30118),
+            span: SourceSpan::new("src/v3/std/lens.dag", 4284, 4316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1984),
+            id: DeclarationId(2005),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1983),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "declaration".to_string(),
+                    ty: DeclarationId(723),
                 }],
             },
             type_params: vec![],
@@ -56551,17 +57457,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 30097, 30119),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 3564, 3611),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1985),
+            id: DeclarationId(2006),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "declaration".to_string(),
+                        ty: DeclarationId(723),
+                    },
+                    Field {
+                        label: "node".to_string(),
+                        ty: DeclarationId(721),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56570,17 +57482,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/induction.dag", 33612, 33616),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 3616, 3677),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1986),
+            id: DeclarationId(2007),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56589,17 +57496,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/induction.dag", 33908, 33912),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 4556, 4561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1987),
+            id: DeclarationId(2008),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1085)],
+                output: DeclarationId(1087),
+                body: ArrowBody::NoBody,
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56608,17 +57514,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/induction.dag", 35157, 35161),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 5798, 5821),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1988),
+            id: DeclarationId(2009),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Arrow {
+                inputs: vec![DeclarationId(1085), DeclarationId(1086)],
+                output: DeclarationId(128),
+                body: ArrowBody::NoBody,
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56627,17 +57532,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/induction.dag", 35632, 35636),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 5834, 5860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1989),
+            id: DeclarationId(2010),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1080),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1081),
+                    value: DeclarationId(1089),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56646,17 +57552,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/induction.dag", 36895, 36899),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 7871, 7883),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1990),
+            id: DeclarationId(2011),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1084),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1085),
+                        value: DeclarationId(1089),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1086),
+                        value: DeclarationId(1090),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1087),
+                        value: DeclarationId(1091),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56665,12 +57582,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/induction.dag", 37167, 37171),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 7899, 7941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1991),
+            id: DeclarationId(2012),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1088),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1089),
+                        value: DeclarationId(1093),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1090),
+                        value: DeclarationId(1094),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1091),
+                        value: DeclarationId(1095),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56679,12 +57612,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/induction.dag", 5629, 5644),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 9711, 9753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1992),
+            id: DeclarationId(2013),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1080),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1081),
+                    value: DeclarationId(1097),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56693,12 +57632,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/induction.dag", 5684, 5697),
+            span: SourceSpan::new("src/v3/std/lens_application.dag", 10773, 10785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1993),
+            id: DeclarationId(2014),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1011),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56707,12 +57652,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 5745, 5762),
+            span: SourceSpan::new(
+                "src/v3/std/python_method_template_contracts.dag",
+                6752,
+                6780,
+            ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1994),
+            id: DeclarationId(2015),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1109),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56721,12 +57676,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/induction.dag", 5801, 5813),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 11243, 11254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1995),
+            id: DeclarationId(2016),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(782),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56735,22 +57695,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/induction.dag", 5861, 5878),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 2137, 2162),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1996),
+            id: DeclarationId(2017),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "field".to_string(),
-                        ty: DeclarationId(1069),
-                    },
-                    Field {
-                        label: "factor".to_string(),
-                        ty: DeclarationId(938),
-                    },
-                ],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1108),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -56760,15 +57715,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/induction.dag", 9971, 10033),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 2179, 2195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1997),
+            id: DeclarationId(2018),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
-                    label: "field".to_string(),
-                    ty: DeclarationId(1069),
+                    label: "_0".to_string(),
+                    ty: DeclarationId(2017),
                 }],
             },
             type_params: vec![],
@@ -56779,20 +57734,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/induction.dag", 10038, 10080),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 2167, 2196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1998),
+            id: DeclarationId(2019),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-                        label: "param".to_string(),
-                        ty: DeclarationId(230),
+                        label: "tag".to_string(),
+                        ty: DeclarationId(723),
                     },
                     Field {
-                        label: "factor".to_string(),
-                        ty: DeclarationId(938),
+                        label: "payload".to_string(),
+                        ty: DeclarationId(1109),
                     },
                 ],
             },
@@ -56804,12 +57759,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/induction.dag", 10085, 10142),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 2201, 2252),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1999),
+            id: DeclarationId(2020),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(721),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56818,12 +57778,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/induction.dag", 10147, 10161),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 2257, 2272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2000),
+            id: DeclarationId(2021),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(818),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56832,12 +57797,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/induction.dag", 10166, 10181),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 2277, 2304),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2001),
+            id: DeclarationId(2022),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(137),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(722),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(1109),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56846,15 +57823,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/induction.dag", 24135, 24149),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 3936, 3954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2002),
+            id: DeclarationId(2023),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "degree".to_string(),
-                    ty: DeclarationId(1205),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1112),
                 }],
             },
             type_params: vec![],
@@ -56865,22 +57843,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/induction.dag", 24154, 24201),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 4542, 4557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2003),
+            id: DeclarationId(2024),
             name: None,
             connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "numerator".to_string(),
-                        ty: DeclarationId(1205),
-                    },
-                    Field {
-                        label: "root".to_string(),
-                        ty: DeclarationId(1205),
-                    },
-                ],
+                children: vec![Field {
+                    label: "input_order".to_string(),
+                    ty: DeclarationId(1116),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -56890,23 +57862,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/induction.dag", 24206, 24283),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 5388, 5442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2004),
+            id: DeclarationId(2025),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "base".to_string(),
-                        ty: DeclarationId(1207),
-                    },
-                    Field {
-                        label: "argument".to_string(),
-                        ty: DeclarationId(1205),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56915,23 +57876,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/induction.dag", 24288, 24362),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 5682, 5691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2005),
+            id: DeclarationId(2026),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "param".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "exponent".to_string(),
-                        ty: DeclarationId(1082),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56940,15 +57890,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/induction.dag", 24982, 25038),
+            span: SourceSpan::new("src/v3/std/runtime.dag", 5694, 5704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2006),
+            id: DeclarationId(2027),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "param".to_string(),
-                    ty: DeclarationId(230),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1011),
                 }],
             },
             type_params: vec![],
@@ -56959,12 +57910,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/induction.dag", 25054, 25079),
+            span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5769, 5797),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2007),
+            id: DeclarationId(2028),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(1124),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56973,17 +57929,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/induction.dag", 26728, 26741),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2008),
+            id: DeclarationId(2029),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "cost".to_string(),
-                    ty: DeclarationId(1084),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(1124),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -56992,18 +57948,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/induction.dag", 26785, 26817),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2009),
+            id: DeclarationId(2030),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1084),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(1124),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -57012,16 +57967,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 26880, 26896),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2010),
+            id: DeclarationId(2031),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "factors".to_string(),
-                    ty: DeclarationId(2009),
-                }],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(137),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(1124),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -57031,17 +57993,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 26856, 26898),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2732, 2760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2011),
+            id: DeclarationId(2032),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1084),
-                }],
+                template: DeclarationId(137),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(1124),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -57051,18 +58019,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/induction.dag", 26960, 26976),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2804, 2832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2012),
+            id: DeclarationId(2033),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(2011),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(1132),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -57071,17 +58038,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/induction.dag", 26955, 26977),
+            span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2013),
+            id: DeclarationId(2034),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "terms".to_string(),
-                    ty: DeclarationId(2012),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(1134),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -57090,17 +58057,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 26927, 26979),
+            span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2014),
+            id: DeclarationId(2035),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1085),
-                }],
+                template: DeclarationId(11),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(12),
+                        value: DeclarationId(1145),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(13),
+                        value: DeclarationId(1144),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -57110,17 +58083,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/induction.dag", 27277, 27292),
+            span: SourceSpan::new("src/v3/std/termination.dag", 12353, 12399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2015),
+            id: DeclarationId(2036),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "terms".to_string(),
-                    ty: DeclarationId(2014),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -57129,10 +58097,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 27259, 27294),
+            span: SourceSpan::new("src/v3/std/termination.dag", 767, 773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2016),
+            id: DeclarationId(2037),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57143,10 +58111,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 27377, 27389),
+            span: SourceSpan::new("src/v3/std/termination.dag", 778, 791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2017),
+            id: DeclarationId(2038),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57157,16 +58125,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/induction.dag", 27459, 27469),
+            span: SourceSpan::new("src/v3/std/termination.dag", 796, 810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2018),
+            id: DeclarationId(2039),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1300),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "param".to_string(),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -57177,16 +58144,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/integer_diagnostic_order.dag", 1234, 1254),
+            span: SourceSpan::new("src/v3/std/termination.dag", 3332, 3358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2019),
+            id: DeclarationId(2040),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1300),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "param".to_string(),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -57197,16 +58163,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/integer_diagnostic_order.dag", 1414, 1434),
+            span: SourceSpan::new("src/v3/std/termination.dag", 3363, 3391),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2020),
+            id: DeclarationId(2041),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1129),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "param".to_string(),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -57217,15 +58182,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/lens.dag", 4180, 4190),
+            span: SourceSpan::new("src/v3/std/termination.dag", 3396, 3429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2021),
+            id: DeclarationId(2042),
             name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2020),
-                body: ArrowBody::NoBody,
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "param".to_string(),
+                    ty: DeclarationId(230),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -57235,16 +58201,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/lens.dag", 4159, 4190),
+            span: SourceSpan::new("src/v3/std/termination.dag", 3434, 3465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2022),
+            id: DeclarationId(2043),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(19),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(20),
-                    value: DeclarationId(1129),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "param".to_string(),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -57255,16 +58220,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/lens.dag", 4205, 4214),
+            span: SourceSpan::new("src/v3/std/termination.dag", 3470, 3502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2023),
+            id: DeclarationId(2044),
             name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1129), DeclarationId(1129)],
-                output: DeclarationId(1129),
-                body: ArrowBody::NoBody,
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -57273,15 +58234,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/lens.dag", 4225, 4238),
+            span: SourceSpan::new("src/v3/std/termination.dag", 4509, 4516),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2024),
+            id: DeclarationId(2045),
             name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1129), DeclarationId(818)],
-                output: DeclarationId(1129),
-                body: ArrowBody::NoBody,
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "previous".to_string(),
+                    ty: DeclarationId(1132),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -57291,16 +58253,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/lens.dag", 4250, 4271),
+            span: SourceSpan::new("src/v3/std/termination.dag", 4521, 4571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2025),
+            id: DeclarationId(2046),
             name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(1129)],
-                output: DeclarationId(986),
-                body: ArrowBody::NoBody,
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -57309,15 +58267,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/lens.dag", 4284, 4316),
+            span: SourceSpan::new("src/v3/std/termination.dag", 5484, 5495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2026),
+            id: DeclarationId(2047),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
-                    label: "declaration".to_string(),
-                    ty: DeclarationId(723),
+                    label: "inner".to_string(),
+                    ty: DeclarationId(1134),
                 }],
             },
             type_params: vec![],
@@ -57328,22 +58286,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/lens_application.dag", 3305, 3352),
+            span: SourceSpan::new("src/v3/std/termination.dag", 5500, 5545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2027),
+            id: DeclarationId(2048),
             name: None,
             connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "declaration".to_string(),
-                        ty: DeclarationId(723),
-                    },
-                    Field {
-                        label: "node".to_string(),
-                        ty: DeclarationId(721),
-                    },
-                ],
+                children: vec![Field {
+                    label: "accessor".to_string(),
+                    ty: DeclarationId(230),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -57353,12 +58305,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/lens_application.dag", 3357, 3418),
+            span: SourceSpan::new("src/v3/std/termination.dag", 7649, 7683),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2028),
+            id: DeclarationId(2049),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "amount".to_string(),
+                    ty: DeclarationId(1132),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -57367,15 +58324,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/lens_application.dag", 4297, 4302),
+            span: SourceSpan::new("src/v3/std/termination.dag", 7688, 7732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2029),
+            id: DeclarationId(2050),
             name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1133)],
-                output: DeclarationId(1134),
-                body: ArrowBody::NoBody,
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "steps".to_string(),
+                    ty: DeclarationId(1132),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -57385,15 +58343,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/lens_application.dag", 5301, 5321),
+            span: SourceSpan::new("src/v3/std/termination.dag", 7737, 7795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2030),
+            id: DeclarationId(2051),
             name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1134), DeclarationId(1134)],
-                output: DeclarationId(128),
-                body: ArrowBody::NoBody,
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "divisor".to_string(),
+                    ty: DeclarationId(1134),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -57403,16 +58362,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/lens_application.dag", 5334, 5360),
+            span: SourceSpan::new("src/v3/std/termination.dag", 7800, 7856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2031),
+            id: DeclarationId(2052),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1128),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1129),
-                    value: DeclarationId(1136),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "witness".to_string(),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -57423,23 +58381,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/lens_application.dag", 7360, 7372),
+            span: SourceSpan::new("src/v3/std/termination.dag", 7861, 7894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2032),
+            id: DeclarationId(2053),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1132),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(1133),
-                        value: DeclarationId(1136),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(1134),
-                        value: DeclarationId(1137),
-                    },
-                ],
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "element".to_string(),
+                    ty: DeclarationId(230),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -57449,24 +58400,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/lens_application.dag", 7388, 7419),
+            span: SourceSpan::new("src/v3/std/termination.dag", 7899, 7929),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2033),
+            id: DeclarationId(2054),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1135),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(1136),
-                        value: DeclarationId(1139),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(1137),
-                        value: DeclarationId(1140),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -57475,16 +58414,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/lens_application.dag", 9093, 9124),
+            span: SourceSpan::new("src/v3/std/termination.dag", 7934, 7947),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2034),
+            id: DeclarationId(2055),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1128),
+                template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1129),
-                    value: DeclarationId(1142),
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1131),
                 }],
             },
             type_params: vec![],
@@ -57495,16 +58434,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/lens_application.dag", 10144, 10156),
+            span: SourceSpan::new("src/v3/std/termination.dag", 7987, 8009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2035),
+            id: DeclarationId(2056),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1143),
+                template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1144),
-                    value: DeclarationId(93),
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1124),
                 }],
             },
             type_params: vec![],
@@ -57515,18 +58454,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/lookup.dag", 4589, 4600),
+            span: SourceSpan::new("src/v3/std/termination.dag", 8219, 8240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2036),
+            id: DeclarationId(2057),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1143),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1144),
-                    value: DeclarationId(93),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -57535,10 +58468,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/lookup.dag", 4642, 4653),
+            span: SourceSpan::new("src/v3/std/termination.dag", 8740, 8746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2037),
+            id: DeclarationId(2058),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57549,17 +58482,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/lookup.dag", 4544, 4548),
+            span: SourceSpan::new("src/v3/std/termination.dag", 9139, 9152),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2038),
+            id: DeclarationId(2059),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1144),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -57568,16 +58496,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/lookup.dag", 4553, 4563),
+            span: SourceSpan::new("src/v3/std/termination.dag", 9157, 9171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2039),
+            id: DeclarationId(2060),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1054),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(1143),
                 }],
             },
             type_params: vec![],
@@ -57588,22 +58515,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/python_method_template_contracts.dag",
-                6752,
-                6780,
-            ),
+            span: SourceSpan::new("src/v3/std/termination.dag", 10263, 10297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2040),
+            id: DeclarationId(2061),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1160),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -57612,16 +58529,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/runtime.dag", 11243, 11254),
+            span: SourceSpan::new("src/v3/std/termination.dag", 10302, 10320),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2041),
+            id: DeclarationId(2062),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(782),
-                }],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(137),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(1142),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -57631,18 +58555,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/runtime.dag", 2137, 2162),
+            span: SourceSpan::new("src/v3/std/termination.dag", 11234, 11261),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2042),
+            id: DeclarationId(2063),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1159),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(956),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -57651,17 +58574,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/runtime.dag", 2179, 2195),
+            span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2043),
+            id: DeclarationId(2064),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(2042),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(961),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -57670,22 +58593,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/runtime.dag", 2167, 2196),
+            span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2044),
+            id: DeclarationId(2065),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "tag".to_string(),
-                        ty: DeclarationId(723),
-                    },
-                    Field {
-                        label: "payload".to_string(),
-                        ty: DeclarationId(1160),
-                    },
-                ],
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1164),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -57695,15 +58613,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/runtime.dag", 2201, 2252),
+            span: SourceSpan::new("src/v3/std/induction.dag", 27850, 27865),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2045),
+            id: DeclarationId(2066),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(721),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1163),
                 }],
             },
             type_params: vec![],
@@ -57714,15 +58633,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/runtime.dag", 2257, 2272),
+            span: SourceSpan::new("src/v3/std/induction.dag", 29879, 29895),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2046),
+            id: DeclarationId(2067),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(818),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1163),
                 }],
             },
             type_params: vec![],
@@ -57733,23 +58653,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/runtime.dag", 2277, 2304),
+            span: SourceSpan::new("src/v3/std/induction.dag", 29988, 30004),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2047),
+            id: DeclarationId(2068),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(137),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(138),
-                        value: DeclarationId(722),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(139),
-                        value: DeclarationId(1160),
-                    },
-                ],
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1163),
+                }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -57759,16 +58673,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/runtime.dag", 3936, 3954),
+            span: SourceSpan::new("src/v3/std/induction.dag", 30102, 30118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2048),
+            id: DeclarationId(2069),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1163),
+                    value: DeclarationId(2068),
                 }],
             },
             type_params: vec![],
@@ -57779,17 +58693,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/runtime.dag", 4542, 4557),
+            span: SourceSpan::new("src/v3/std/induction.dag", 30097, 30119),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2049),
+            id: DeclarationId(2070),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "input_order".to_string(),
-                    ty: DeclarationId(1167),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(93),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -57798,12 +58712,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/runtime.dag", 5388, 5442),
+            span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2050),
+            id: DeclarationId(2071),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(93),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -57812,12 +58731,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/runtime.dag", 5682, 5691),
+            span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2051),
+            id: DeclarationId(2072),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(93),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -57826,18 +58750,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/runtime.dag", 5694, 5704),
+            span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2052),
+            id: DeclarationId(2073),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1054),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(93),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -57846,24 +58769,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/rust_method_template_contracts.dag", 5769, 5797),
+            span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2053),
+            id: DeclarationId(2074),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(137),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(138),
-                        value: DeclarationId(230),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(139),
-                        value: DeclarationId(1175),
-                    },
-                ],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(93),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -57872,18 +58788,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/services.dag", 6784, 6807),
+            span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2054),
+            id: DeclarationId(2075),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
-                }],
-            },
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(93),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -57892,18 +58807,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/t_ci_workflow_as_data_demo.dag", 3054, 3080),
+            span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2055),
+            id: DeclarationId(2076),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -57912,18 +58821,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/t_ci_workflow_as_data_demo.dag", 4626, 4652),
+            span: SourceSpan::new("src/v3/std/induction.dag", 5629, 5644),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2056),
+            id: DeclarationId(2077),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(799),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -57932,18 +58835,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/t_ci_workflow_as_data_demo.dag", 4920, 4937),
+            span: SourceSpan::new("src/v3/std/induction.dag", 5684, 5697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2057),
+            id: DeclarationId(2078),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(827),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -57952,18 +58849,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/t_ci_workflow_as_data_demo.dag", 4988, 5002),
+            span: SourceSpan::new("src/v3/std/induction.dag", 5745, 5762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2058),
+            id: DeclarationId(2079),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(781),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -57972,18 +58863,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/t_ci_workflow_as_data_demo.dag", 5052, 5065),
+            span: SourceSpan::new("src/v3/std/induction.dag", 5801, 5813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2059),
+            id: DeclarationId(2080),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(817),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -57992,17 +58877,22 @@ 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", 5115, 5128),
+            span: SourceSpan::new("src/v3/std/induction.dag", 5861, 5878),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2060),
+            id: DeclarationId(2081),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(982),
-                }],
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "field".to_string(),
+                        ty: DeclarationId(1148),
+                    },
+                    Field {
+                        label: "factor".to_string(),
+                        ty: DeclarationId(959),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -58012,16 +58902,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/t_ci_workflow_as_data_demo.dag", 5176, 5192),
+            span: SourceSpan::new("src/v3/std/induction.dag", 9971, 10033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2061),
+            id: DeclarationId(2082),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "field".to_string(),
+                    ty: DeclarationId(1148),
                 }],
             },
             type_params: vec![],
@@ -58032,17 +58921,22 @@ 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", 5245, 5271),
+            span: SourceSpan::new("src/v3/std/induction.dag", 10038, 10080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2062),
+            id: DeclarationId(2083),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(2061),
-                }],
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "param".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "factor".to_string(),
+                        ty: DeclarationId(959),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -58052,18 +58946,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/t_ci_workflow_as_data_demo.dag", 5240, 5272),
+            span: SourceSpan::new("src/v3/std/induction.dag", 10085, 10142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2063),
+            id: DeclarationId(2084),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58072,18 +58960,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/t_ci_workflow_as_data_demo.dag", 5346, 5372),
+            span: SourceSpan::new("src/v3/std/induction.dag", 10147, 10161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2064),
+            id: DeclarationId(2085),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(2063),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58092,18 +58974,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/t_ci_workflow_as_data_demo.dag", 5341, 5373),
+            span: SourceSpan::new("src/v3/std/induction.dag", 10166, 10181),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2065),
+            id: DeclarationId(2086),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(982),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58112,16 +58988,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/t_ci_workflow_as_data_demo.dag", 5498, 5514),
+            span: SourceSpan::new("src/v3/std/induction.dag", 24135, 24149),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2066),
+            id: DeclarationId(2087),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(987),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(988),
-                    value: DeclarationId(1222),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "degree".to_string(),
+                    ty: DeclarationId(1132),
                 }],
             },
             type_params: vec![],
@@ -58132,17 +59007,22 @@ 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", 5639, 5673),
+            span: SourceSpan::new("src/v3/std/induction.dag", 24154, 24201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2067),
+            id: DeclarationId(2088),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(987),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(988),
-                    value: DeclarationId(1222),
-                }],
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "numerator".to_string(),
+                        ty: DeclarationId(1132),
+                    },
+                    Field {
+                        label: "root".to_string(),
+                        ty: DeclarationId(1132),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -58152,17 +59032,22 @@ 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", 5885, 5919),
+            span: SourceSpan::new("src/v3/std/induction.dag", 24206, 24283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2068),
+            id: DeclarationId(2089),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(987),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(988),
-                    value: DeclarationId(1222),
-                }],
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "base".to_string(),
+                        ty: DeclarationId(1134),
+                    },
+                    Field {
+                        label: "argument".to_string(),
+                        ty: DeclarationId(1132),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -58172,17 +59057,22 @@ 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", 6404, 6438),
+            span: SourceSpan::new("src/v3/std/induction.dag", 24288, 24362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2069),
+            id: DeclarationId(2090),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(987),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(988),
-                    value: DeclarationId(1222),
-                }],
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "param".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "exponent".to_string(),
+                        ty: DeclarationId(1161),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -58192,16 +59082,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/t_ci_workflow_as_data_demo.dag", 6665, 6699),
+            span: SourceSpan::new("src/v3/std/induction.dag", 24982, 25038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2070),
+            id: DeclarationId(2091),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(987),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(988),
-                    value: DeclarationId(1222),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "param".to_string(),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -58212,18 +59101,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/t_ci_workflow_as_data_demo.dag", 6955, 6989),
+            span: SourceSpan::new("src/v3/std/induction.dag", 25054, 25079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2071),
+            id: DeclarationId(2092),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58232,16 +59115,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/t_ci_workflow_as_data_demo.dag", 7169, 7195),
+            span: SourceSpan::new("src/v3/std/induction.dag", 26728, 26741),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2072),
+            id: DeclarationId(2093),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(987),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(988),
-                    value: DeclarationId(1222),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "cost".to_string(),
+                    ty: DeclarationId(1163),
                 }],
             },
             type_params: vec![],
@@ -58252,16 +59134,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/t_ci_workflow_as_data_demo.dag", 7200, 7234),
+            span: SourceSpan::new("src/v3/std/induction.dag", 26785, 26817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2073),
+            id: DeclarationId(2094),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(987),
+                template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(988),
-                    value: DeclarationId(1222),
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1163),
                 }],
             },
             type_params: vec![],
@@ -58272,16 +59154,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/t_ci_workflow_as_data_demo.dag", 8469, 8503),
+            span: SourceSpan::new("src/v3/std/induction.dag", 26880, 26896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2074),
+            id: DeclarationId(2095),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1922),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "factors".to_string(),
+                    ty: DeclarationId(2094),
                 }],
             },
             type_params: vec![],
@@ -58292,16 +59173,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/t_ci_workflow_as_data_demo.dag", 3054, 3080),
+            span: SourceSpan::new("src/v3/std/induction.dag", 26856, 26898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2075),
+            id: DeclarationId(2096),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1922),
+                template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1163),
                 }],
             },
             type_params: vec![],
@@ -58312,16 +59193,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/t_ci_workflow_as_data_demo.dag", 3054, 3080),
+            span: SourceSpan::new("src/v3/std/induction.dag", 26960, 26976),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2076),
+            id: DeclarationId(2097),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1922),
+                template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(2096),
                 }],
             },
             type_params: vec![],
@@ -58332,16 +59213,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/t_ci_workflow_as_data_demo.dag", 3054, 3080),
+            span: SourceSpan::new("src/v3/std/induction.dag", 26955, 26977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2077),
+            id: DeclarationId(2098),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1922),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "terms".to_string(),
+                    ty: DeclarationId(2097),
                 }],
             },
             type_params: vec![],
@@ -58352,16 +59232,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/t_ci_workflow_as_data_demo.dag", 3054, 3080),
+            span: SourceSpan::new("src/v3/std/induction.dag", 26927, 26979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2078),
+            id: DeclarationId(2099),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1922),
+                template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1164),
                 }],
             },
             type_params: vec![],
@@ -58372,16 +59252,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/t_ci_workflow_as_data_demo.dag", 3054, 3080),
+            span: SourceSpan::new("src/v3/std/induction.dag", 27277, 27292),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2079),
+            id: DeclarationId(2100),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1922),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "terms".to_string(),
+                    ty: DeclarationId(2099),
                 }],
             },
             type_params: vec![],
@@ -58392,18 +59271,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/t_ci_workflow_as_data_demo.dag", 3054, 3080),
+            span: SourceSpan::new("src/v3/std/induction.dag", 27259, 27294),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2080),
+            id: DeclarationId(2101),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1922),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58412,18 +59285,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/t_ci_workflow_as_data_demo.dag", 3054, 3080),
+            span: SourceSpan::new("src/v3/std/induction.dag", 27377, 27389),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2081),
+            id: DeclarationId(2102),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1922),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58432,18 +59299,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/t_ci_workflow_as_data_demo.dag", 3054, 3080),
+            span: SourceSpan::new("src/v3/std/induction.dag", 27459, 27469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2082),
+            id: DeclarationId(2103),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1922),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58452,18 +59313,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/t_ci_workflow_as_data_demo.dag", 3054, 3080),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2083),
+            id: DeclarationId(2104),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1922),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58472,18 +59327,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/t_ci_workflow_as_data_demo.dag", 3054, 3080),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2084),
+            id: DeclarationId(2105),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1434),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(799),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58492,18 +59341,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/t_ci_workflow_as_data_demo.dag", 4920, 4937),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2085),
+            id: DeclarationId(2106),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1434),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(827),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58512,18 +59355,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/t_ci_workflow_as_data_demo.dag", 4988, 5002),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2086),
+            id: DeclarationId(2107),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1434),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(781),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58532,18 +59369,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/t_ci_workflow_as_data_demo.dag", 5052, 5065),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2087),
+            id: DeclarationId(2108),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1434),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(817),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58552,18 +59383,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/t_ci_workflow_as_data_demo.dag", 5115, 5128),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2088),
+            id: DeclarationId(2109),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1434),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(982),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58572,18 +59397,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/t_ci_workflow_as_data_demo.dag", 5176, 5192),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 715),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2089),
+            id: DeclarationId(2110),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1434),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(2061),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58592,18 +59411,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/t_ci_workflow_as_data_demo.dag", 5240, 5272),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 720, 728),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2090),
+            id: DeclarationId(2111),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1436),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(2063),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58612,18 +59425,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/t_ci_workflow_as_data_demo.dag", 5341, 5373),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 733, 740),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2091),
+            id: DeclarationId(2112),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1922),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58632,18 +59439,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/t_ci_workflow_as_data_demo.dag", 5346, 5372),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 745, 751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2092),
+            id: DeclarationId(2113),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1436),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(982),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58652,18 +59453,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/t_ci_workflow_as_data_demo.dag", 5498, 5514),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 756, 763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2093),
+            id: DeclarationId(2114),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1928),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(988),
-                    value: DeclarationId(1222),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58672,18 +59467,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/t_ci_workflow_as_data_demo.dag", 5639, 5673),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 768, 774),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2094),
+            id: DeclarationId(2115),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1932),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(988),
-                    value: DeclarationId(1222),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58692,17 +59481,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/t_ci_workflow_as_data_demo.dag", 5885, 5919),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 779, 786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2095),
+            id: DeclarationId(2116),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1197),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58711,17 +59500,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/termination.dag", 2429, 2445),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 791, 804),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2096),
+            id: DeclarationId(2117),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1197),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58730,17 +59519,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/termination.dag", 2450, 2466),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 889, 903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2097),
+            id: DeclarationId(2118),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1197),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58749,24 +59538,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/termination.dag", 2471, 2487),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 908, 925),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2098),
+            id: DeclarationId(2119),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(137),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(138),
-                        value: DeclarationId(230),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(139),
-                        value: DeclarationId(1197),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58775,24 +59552,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/termination.dag", 2732, 2760),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 930, 932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2099),
+            id: DeclarationId(2120),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(137),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(138),
-                        value: DeclarationId(230),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(139),
-                        value: DeclarationId(1197),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58801,17 +59566,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/termination.dag", 2804, 2832),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 937, 941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2100),
+            id: DeclarationId(2121),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1205),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58820,17 +59580,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/termination.dag", 6397, 6419),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 946, 951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2101),
+            id: DeclarationId(2122),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1207),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58839,24 +59594,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/termination.dag", 6839, 6859),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 956, 958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2102),
+            id: DeclarationId(2123),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(11),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(12),
-                        value: DeclarationId(1218),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(13),
-                        value: DeclarationId(1217),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58865,10 +59608,10 @@ 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", 12353, 12399),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 963, 965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2103),
+            id: DeclarationId(2124),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58879,10 +59622,10 @@ 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", 767, 773),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 970, 972),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2104),
+            id: DeclarationId(2125),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58893,10 +59636,10 @@ 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", 778, 791),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 977, 979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2105),
+            id: DeclarationId(2126),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58907,17 +59650,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/termination.dag", 796, 810),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 984, 988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2106),
+            id: DeclarationId(2127),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "param".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58926,17 +59664,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/termination.dag", 3332, 3358),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 993, 998),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2107),
+            id: DeclarationId(2128),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "param".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58945,17 +59678,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/termination.dag", 3363, 3391),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1003, 1007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2108),
+            id: DeclarationId(2129),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "param".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58964,17 +59692,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/termination.dag", 3396, 3429),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1012, 1017),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2109),
+            id: DeclarationId(2130),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "param".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -58983,17 +59706,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/termination.dag", 3434, 3465),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1022, 1028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2110),
+            id: DeclarationId(2131),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "param".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59002,10 +59720,10 @@ 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", 3470, 3502),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1033, 1041),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2111),
+            id: DeclarationId(2132),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59016,17 +59734,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/termination.dag", 4509, 4516),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1046, 1051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2112),
+            id: DeclarationId(2133),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "previous".to_string(),
-                    ty: DeclarationId(1205),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59035,10 +59748,10 @@ 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", 4521, 4571),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1056, 1061),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2113),
+            id: DeclarationId(2134),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59049,17 +59762,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/termination.dag", 5484, 5495),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1066, 1074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2114),
+            id: DeclarationId(2135),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "inner".to_string(),
-                    ty: DeclarationId(1207),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59068,17 +59776,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/termination.dag", 5500, 5545),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1079, 1088),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2115),
+            id: DeclarationId(2136),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "accessor".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59087,17 +59790,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/termination.dag", 7649, 7683),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1093, 1096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2116),
+            id: DeclarationId(2137),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "amount".to_string(),
-                    ty: DeclarationId(1205),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59106,17 +59804,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/termination.dag", 7688, 7732),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1101, 1107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2117),
+            id: DeclarationId(2138),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "steps".to_string(),
-                    ty: DeclarationId(1205),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59125,17 +59818,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/termination.dag", 7737, 7795),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1112, 1118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2118),
+            id: DeclarationId(2139),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "divisor".to_string(),
-                    ty: DeclarationId(1207),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59144,17 +59832,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/termination.dag", 7800, 7856),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1123, 1129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2119),
+            id: DeclarationId(2140),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "witness".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59163,17 +59846,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/termination.dag", 7861, 7894),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1134, 1140),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2120),
+            id: DeclarationId(2141),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "element".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59182,10 +59860,10 @@ 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", 7899, 7929),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1145, 1153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2121),
+            id: DeclarationId(2142),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59196,18 +59874,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/termination.dag", 7934, 7947),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1158, 1166),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2122),
+            id: DeclarationId(2143),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1204),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59216,18 +59888,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/termination.dag", 7987, 8009),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1171, 1176),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2123),
+            id: DeclarationId(2144),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1197),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59236,10 +59902,10 @@ 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", 8219, 8240),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1181, 1190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2124),
+            id: DeclarationId(2145),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59250,10 +59916,10 @@ 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", 8740, 8746),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1195, 1199),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2125),
+            id: DeclarationId(2146),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59264,10 +59930,10 @@ 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", 9139, 9152),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1204, 1212),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2126),
+            id: DeclarationId(2147),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59278,17 +59944,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/termination.dag", 9157, 9171),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1217, 1220),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2127),
+            id: DeclarationId(2148),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1216),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59297,10 +59958,10 @@ 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", 10263, 10297),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1791, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2128),
+            id: DeclarationId(2149),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59311,24 +59972,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/termination.dag", 10302, 10320),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1801, 1805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2129),
+            id: DeclarationId(2150),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(137),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(138),
-                        value: DeclarationId(230),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(139),
-                        value: DeclarationId(1215),
-                    },
-                ],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59337,18 +59986,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/termination.dag", 11234, 11261),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1810, 1816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2130),
+            id: DeclarationId(2151),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(978),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59357,18 +60000,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/timing_lens.dag", 9931, 9947),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1821, 1827),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2131),
+            id: DeclarationId(2152),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59377,17 +60014,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/timing_lens.dag", 13840, 13866),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1832, 1836),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2132),
+            id: DeclarationId(2153),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "duration".to_string(),
-                    ty: DeclarationId(1221),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59396,10 +60028,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 4032, 4066),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1841, 1847),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2133),
+            id: DeclarationId(2154),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59410,10 +60042,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 4071, 4081),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1852, 1860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2134),
+            id: DeclarationId(2155),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59424,10 +60056,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 4086, 4095),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1865, 1873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2135),
+            id: DeclarationId(2156),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59438,18 +60070,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/timing_lens.dag", 4100, 4105),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1878, 1885),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2136),
+            id: DeclarationId(2157),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1227),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59458,18 +60084,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/timing_lens.dag", 7603, 7631),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1890, 1896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2137),
+            id: DeclarationId(2158),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1434),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(978),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59478,18 +60098,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/timing_lens.dag", 9931, 9947),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1901, 1908),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2138),
+            id: DeclarationId(2159),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1922),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59498,18 +60112,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/timing_lens.dag", 13840, 13866),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1913, 1919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2139),
+            id: DeclarationId(2160),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1922),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59518,18 +60126,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/timing_lens.dag", 13840, 13866),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 1924, 1931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2140),
+            id: DeclarationId(2161),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1922),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59538,18 +60140,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/timing_lens.dag", 13840, 13866),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2371, 2373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2141),
+            id: DeclarationId(2162),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1922),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59558,18 +60154,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/timing_lens.dag", 13840, 13866),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2378, 2382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2142),
+            id: DeclarationId(2163),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1922),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59578,18 +60168,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/timing_lens.dag", 13840, 13866),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2387, 2392),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2143),
+            id: DeclarationId(2164),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1922),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59598,18 +60182,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/timing_lens.dag", 13840, 13866),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2397, 2399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2144),
+            id: DeclarationId(2165),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1922),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59618,18 +60196,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/timing_lens.dag", 13840, 13866),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2404, 2406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2145),
+            id: DeclarationId(2166),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1922),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59638,18 +60210,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/timing_lens.dag", 13840, 13866),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2411, 2413),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2146),
+            id: DeclarationId(2167),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1922),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59658,18 +60224,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/timing_lens.dag", 13840, 13866),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2418, 2420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2147),
+            id: DeclarationId(2168),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1922),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59678,10 +60238,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2425, 2429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2148),
+            id: DeclarationId(2169),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59692,10 +60252,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2434, 2439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2149),
+            id: DeclarationId(2170),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59706,10 +60266,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2444, 2448),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2150),
+            id: DeclarationId(2171),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59720,10 +60280,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2453, 2458),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2151),
+            id: DeclarationId(2172),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59734,10 +60294,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2463, 2469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2152),
+            id: DeclarationId(2173),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59748,10 +60308,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2474, 2482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2153),
+            id: DeclarationId(2174),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59762,10 +60322,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2487, 2492),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2154),
+            id: DeclarationId(2175),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59776,10 +60336,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 715),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2497, 2502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2155),
+            id: DeclarationId(2176),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59790,10 +60350,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 720, 728),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2507, 2515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2156),
+            id: DeclarationId(2177),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59804,10 +60364,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 733, 740),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2520, 2529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2157),
+            id: DeclarationId(2178),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59818,10 +60378,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 745, 751),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2534, 2537),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2158),
+            id: DeclarationId(2179),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59832,10 +60392,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 756, 763),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2542, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2159),
+            id: DeclarationId(2180),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59846,10 +60406,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 768, 774),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2553, 2559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2160),
+            id: DeclarationId(2181),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59860,17 +60420,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/tokenize.dag", 779, 786),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2564, 2570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2161),
+            id: DeclarationId(2182),
             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,
@@ -59879,17 +60434,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/tokenize.dag", 791, 804),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2575, 2581),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2162),
+            id: DeclarationId(2183),
             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,
@@ -59898,17 +60448,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/tokenize.dag", 889, 903),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2586, 2594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2163),
+            id: DeclarationId(2184),
             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,
@@ -59917,10 +60462,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 908, 925),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2599, 2607),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2164),
+            id: DeclarationId(2185),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59931,10 +60476,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 930, 932),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2612, 2617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2165),
+            id: DeclarationId(2186),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59945,10 +60490,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 937, 941),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2622, 2631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2166),
+            id: DeclarationId(2187),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59959,10 +60504,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 946, 951),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2636, 2640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2167),
+            id: DeclarationId(2188),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59973,12 +60518,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/tokenize.dag", 956, 958),
+            span: SourceSpan::new("src/v3/std/tokenize.dag", 2645, 2653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2168),
+            id: DeclarationId(2189),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(827),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -59987,12 +60538,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/tokenize.dag", 963, 965),
+            span: SourceSpan::new("src/v3/std/workflows.dag", 992, 1006),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2169),
+            id: DeclarationId(2190),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1035),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60001,12 +60558,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/tokenize.dag", 970, 972),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11283, 11299),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2170),
+            id: DeclarationId(2191),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1041),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60015,12 +60578,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/tokenize.dag", 977, 979),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15192, 15218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2171),
+            id: DeclarationId(2192),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "duration".to_string(),
+                    ty: DeclarationId(1213),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60029,10 +60597,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 984, 988),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 4130, 4164),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2172),
+            id: DeclarationId(2193),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60043,10 +60611,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 993, 998),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 4169, 4179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2173),
+            id: DeclarationId(2194),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60057,10 +60625,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1003, 1007),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 4184, 4193),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2174),
+            id: DeclarationId(2195),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60071,12 +60639,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/tokenize.dag", 1012, 1017),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 4198, 4203),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2175),
+            id: DeclarationId(2196),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1219),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60085,12 +60659,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/tokenize.dag", 1022, 1028),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7701, 7729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2176),
+            id: DeclarationId(2197),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "max".to_string(),
+                    ty: DeclarationId(1213),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60099,10 +60678,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1033, 1041),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9213, 9244),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2177),
+            id: DeclarationId(2198),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60113,12 +60692,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/tokenize.dag", 1046, 1051),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9249, 9265),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2178),
+            id: DeclarationId(2199),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(19),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(20),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60127,12 +60712,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/tokenize.dag", 1056, 1061),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18553, 18578),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2179),
+            id: DeclarationId(2200),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1084),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1085),
+                        value: DeclarationId(1214),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1086),
+                        value: DeclarationId(1220),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1087),
+                        value: DeclarationId(1221),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60141,12 +60742,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/tokenize.dag", 1066, 1074),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 18895, 18971),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2180),
+            id: DeclarationId(2201),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1088),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1089),
+                        value: DeclarationId(1214),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1090),
+                        value: DeclarationId(1220),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1091),
+                        value: DeclarationId(1221),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60155,12 +60772,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/tokenize.dag", 1079, 1088),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 19082, 19158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2181),
+            id: DeclarationId(2202),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1448),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1035),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60169,12 +60792,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/tokenize.dag", 1093, 1096),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11283, 11299),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2182),
+            id: DeclarationId(2203),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1982),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60183,12 +60812,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/tokenize.dag", 1101, 1107),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15192, 15218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2183),
+            id: DeclarationId(2204),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1982),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60197,12 +60832,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/tokenize.dag", 1112, 1118),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15192, 15218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2184),
+            id: DeclarationId(2205),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1982),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60211,12 +60852,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/tokenize.dag", 1123, 1129),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15192, 15218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2185),
+            id: DeclarationId(2206),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1982),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60225,12 +60872,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/tokenize.dag", 1134, 1140),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15192, 15218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2186),
+            id: DeclarationId(2207),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1982),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60239,12 +60892,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/tokenize.dag", 1145, 1153),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15192, 15218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2187),
+            id: DeclarationId(2208),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1982),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60253,12 +60912,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/tokenize.dag", 1158, 1166),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15192, 15218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2188),
+            id: DeclarationId(2209),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1982),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60267,12 +60932,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/tokenize.dag", 1171, 1176),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15192, 15218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2189),
+            id: DeclarationId(2210),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1982),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60281,12 +60952,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/tokenize.dag", 1181, 1190),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15192, 15218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2190),
+            id: DeclarationId(2211),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1982),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60295,12 +60972,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/tokenize.dag", 1195, 1199),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15192, 15218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2191),
+            id: DeclarationId(2212),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1982),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60309,12 +60992,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/tokenize.dag", 1204, 1212),
+            span: SourceSpan::new("src/v3/std/timing_lens.dag", 15192, 15218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2192),
+            id: DeclarationId(2213),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1041),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60323,12 +61012,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/tokenize.dag", 1217, 1220),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3215, 3241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2193),
+            id: DeclarationId(2214),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1041),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60337,12 +61032,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/tokenize.dag", 1791, 1796),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4787, 4813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2194),
+            id: DeclarationId(2215),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(799),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60351,12 +61052,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/tokenize.dag", 1801, 1805),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5081, 5098),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2195),
+            id: DeclarationId(2216),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(827),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60365,12 +61072,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/tokenize.dag", 1810, 1816),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5149, 5163),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2196),
+            id: DeclarationId(2217),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(781),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60379,12 +61092,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/tokenize.dag", 1821, 1827),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5213, 5226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2197),
+            id: DeclarationId(2218),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(817),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60393,12 +61112,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/tokenize.dag", 1832, 1836),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5276, 5289),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2198),
+            id: DeclarationId(2219),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1039),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60407,12 +61132,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/tokenize.dag", 1841, 1847),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5337, 5353),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2199),
+            id: DeclarationId(2220),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1041),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60421,12 +61152,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/tokenize.dag", 1852, 1860),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5406, 5432),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2200),
+            id: DeclarationId(2221),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(2220),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60435,12 +61172,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/tokenize.dag", 1865, 1873),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5401, 5433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2201),
+            id: DeclarationId(2222),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1041),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60449,12 +61192,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/tokenize.dag", 1878, 1885),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5507, 5533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2202),
+            id: DeclarationId(2223),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(2222),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60463,12 +61212,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/tokenize.dag", 1890, 1896),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5502, 5534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2203),
+            id: DeclarationId(2224),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(685),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1039),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60477,12 +61232,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/tokenize.dag", 1901, 1908),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5659, 5675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2204),
+            id: DeclarationId(2225),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1044),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1045),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60491,12 +61252,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/tokenize.dag", 1913, 1919),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5800, 5834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2205),
+            id: DeclarationId(2226),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1044),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1045),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60505,12 +61272,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/tokenize.dag", 1924, 1931),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6046, 6080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2206),
+            id: DeclarationId(2227),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1044),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1045),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60519,12 +61292,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/tokenize.dag", 2371, 2373),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6565, 6599),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2207),
+            id: DeclarationId(2228),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1044),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1045),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60533,12 +61312,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/tokenize.dag", 2378, 2382),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6826, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2208),
+            id: DeclarationId(2229),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1044),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1045),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60547,12 +61332,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/tokenize.dag", 2387, 2392),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7116, 7150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2209),
+            id: DeclarationId(2230),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1041),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60561,12 +61352,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/tokenize.dag", 2397, 2399),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7330, 7356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2210),
+            id: DeclarationId(2231),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1044),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1045),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60575,12 +61372,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/tokenize.dag", 2404, 2406),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7361, 7395),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2211),
+            id: DeclarationId(2232),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1044),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1045),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60589,12 +61392,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/tokenize.dag", 2411, 2413),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8630, 8664),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2212),
+            id: DeclarationId(2233),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1092),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(1093),
+                        value: DeclarationId(1214),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1094),
+                        value: DeclarationId(1220),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(1095),
+                        value: DeclarationId(1221),
+                    },
+                ],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60603,12 +61422,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/tokenize.dag", 2418, 2420),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 10623, 10703),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2213),
+            id: DeclarationId(2234),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1982),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60617,12 +61442,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/tokenize.dag", 2425, 2429),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3215, 3241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2214),
+            id: DeclarationId(2235),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1982),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60631,12 +61462,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/tokenize.dag", 2434, 2439),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3215, 3241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2215),
+            id: DeclarationId(2236),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1982),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60645,12 +61482,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/tokenize.dag", 2444, 2448),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3215, 3241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2216),
+            id: DeclarationId(2237),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1982),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60659,12 +61502,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/tokenize.dag", 2453, 2458),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3215, 3241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2217),
+            id: DeclarationId(2238),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1982),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60673,12 +61522,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/tokenize.dag", 2463, 2469),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3215, 3241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2218),
+            id: DeclarationId(2239),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1982),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60687,12 +61542,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/tokenize.dag", 2474, 2482),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3215, 3241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2219),
+            id: DeclarationId(2240),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1982),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60701,12 +61562,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/tokenize.dag", 2487, 2492),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3215, 3241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2220),
+            id: DeclarationId(2241),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1982),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60715,12 +61582,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/tokenize.dag", 2497, 2502),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3215, 3241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2221),
+            id: DeclarationId(2242),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1982),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60729,12 +61602,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/tokenize.dag", 2507, 2515),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3215, 3241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2222),
+            id: DeclarationId(2243),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1982),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60743,12 +61622,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/tokenize.dag", 2520, 2529),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3215, 3241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2223),
+            id: DeclarationId(2244),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1448),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(799),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60757,12 +61642,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/tokenize.dag", 2534, 2537),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5081, 5098),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2224),
+            id: DeclarationId(2245),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1448),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(827),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60771,12 +61662,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/tokenize.dag", 2542, 2548),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5149, 5163),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2225),
+            id: DeclarationId(2246),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1448),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(781),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60785,12 +61682,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/tokenize.dag", 2553, 2559),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5213, 5226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2226),
+            id: DeclarationId(2247),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1448),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(817),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60799,12 +61702,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/tokenize.dag", 2564, 2570),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5276, 5289),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2227),
+            id: DeclarationId(2248),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1448),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1039),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60813,12 +61722,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/tokenize.dag", 2575, 2581),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5337, 5353),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2228),
+            id: DeclarationId(2249),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1448),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(2220),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60827,12 +61742,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/tokenize.dag", 2586, 2594),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5401, 5433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2229),
+            id: DeclarationId(2250),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1450),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(2222),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60841,12 +61762,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/tokenize.dag", 2599, 2607),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5502, 5534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2230),
+            id: DeclarationId(2251),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1982),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1042),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60855,12 +61782,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/tokenize.dag", 2612, 2617),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5507, 5533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2231),
+            id: DeclarationId(2252),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1450),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(686),
+                    value: DeclarationId(1039),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60869,12 +61802,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/tokenize.dag", 2622, 2631),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5659, 5675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2232),
+            id: DeclarationId(2253),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1988),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1045),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60883,12 +61822,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/tokenize.dag", 2636, 2640),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5800, 5834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2233),
+            id: DeclarationId(2254),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1992),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(1045),
+                    value: DeclarationId(1214),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -60897,16 +61842,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/tokenize.dag", 2645, 2653),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6046, 6080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2234),
+            id: DeclarationId(2255),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1158),
+                    value: DeclarationId(948),
                 }],
             },
             type_params: vec![],
@@ -60920,13 +61865,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 27585, 27608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2235),
+            id: DeclarationId(2256),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1285),
+                    value: DeclarationId(1300),
                 }],
             },
             type_params: vec![],
@@ -60940,13 +61885,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 28677, 28693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2236),
+            id: DeclarationId(2257),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1287),
+                    value: DeclarationId(1302),
                 }],
             },
             type_params: vec![],
@@ -60960,7 +61905,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 28698, 28718),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2237),
+            id: DeclarationId(2258),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60974,7 +61919,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(2238),
+            id: DeclarationId(2259),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60988,7 +61933,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(2239),
+            id: DeclarationId(2260),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61002,7 +61947,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(2240),
+            id: DeclarationId(2261),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61016,7 +61961,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(2241),
+            id: DeclarationId(2262),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61030,7 +61975,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(2242),
+            id: DeclarationId(2263),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61044,7 +61989,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(2243),
+            id: DeclarationId(2264),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61058,7 +62003,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(2244),
+            id: DeclarationId(2265),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61072,7 +62017,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(2245),
+            id: DeclarationId(2266),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61086,7 +62031,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(2246),
+            id: DeclarationId(2267),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61100,7 +62045,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(2247),
+            id: DeclarationId(2268),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61114,7 +62059,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(2248),
+            id: DeclarationId(2269),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61133,7 +62078,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(2249),
+            id: DeclarationId(2270),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61147,7 +62092,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(2250),
+            id: DeclarationId(2271),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61161,7 +62106,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(2251),
+            id: DeclarationId(2272),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61175,7 +62120,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(2252),
+            id: DeclarationId(2273),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61189,7 +62134,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(2253),
+            id: DeclarationId(2274),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61203,7 +62148,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(2254),
+            id: DeclarationId(2275),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61217,7 +62162,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(2255),
+            id: DeclarationId(2276),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61242,12 +62187,12 @@ 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(2256),
+            id: DeclarationId(2277),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "var".to_string(),
-                    ty: DeclarationId(1270),
+                    ty: DeclarationId(1285),
                 }],
             },
             type_params: vec![],
@@ -61261,7 +62206,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(2257),
+            id: DeclarationId(2278),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61275,7 +62220,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(2258),
+            id: DeclarationId(2279),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61289,7 +62234,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(2259),
+            id: DeclarationId(2280),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61303,7 +62248,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(2260),
+            id: DeclarationId(2281),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61317,7 +62262,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(2261),
+            id: DeclarationId(2282),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61331,7 +62276,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(2262),
+            id: DeclarationId(2283),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61345,7 +62290,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(2263),
+            id: DeclarationId(2284),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61359,7 +62304,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(2264),
+            id: DeclarationId(2285),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61373,7 +62318,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(2265),
+            id: DeclarationId(2286),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61387,7 +62332,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(2266),
+            id: DeclarationId(2287),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61401,7 +62346,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(2267),
+            id: DeclarationId(2288),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61415,12 +62360,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 9797, 9805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2268),
+            id: DeclarationId(2289),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1263),
+                    ty: DeclarationId(1278),
                 }],
             },
             type_params: vec![],
@@ -61434,7 +62379,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 9810, 9850),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2269),
+            id: DeclarationId(2290),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61453,7 +62398,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 9855, 9888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2270),
+            id: DeclarationId(2291),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61463,7 +62408,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "state".to_string(),
-                        ty: DeclarationId(1264),
+                        ty: DeclarationId(1279),
                     },
                 ],
             },
@@ -61478,7 +62423,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 9893, 9971),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2271),
+            id: DeclarationId(2292),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61497,7 +62442,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 10137, 10200),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2272),
+            id: DeclarationId(2293),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61526,21 +62471,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 10205, 10296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2273),
+            id: DeclarationId(2294),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                     Field {
                         label: "input_sample".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                     Field {
                         label: "expected_output".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                 ],
             },
@@ -61555,17 +62500,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 10301, 10433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2274),
+            id: DeclarationId(2295),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                     Field {
                         label: "invariant".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                 ],
             },
@@ -61580,7 +62525,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 10648, 10737),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2275),
+            id: DeclarationId(2296),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -61600,7 +62545,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 11537, 11549),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2276),
+            id: DeclarationId(2297),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61610,7 +62555,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2275),
+                        ty: DeclarationId(2296),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -61629,7 +62574,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 11486, 11583),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2277),
+            id: DeclarationId(2298),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -61649,7 +62594,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 12298, 12310),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2278),
+            id: DeclarationId(2299),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61659,7 +62604,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2277),
+                        ty: DeclarationId(2298),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -61667,7 +62612,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "input_ref".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                 ],
             },
@@ -61682,21 +62627,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 12248, 12376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2279),
+            id: DeclarationId(2300),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "lens_ref".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                     Field {
                         label: "input_ref".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                     Field {
                         label: "expected_ref".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                 ],
             },
@@ -61711,21 +62656,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 12674, 12796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2280),
+            id: DeclarationId(2301),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject_ref".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                     Field {
                         label: "oracle_ref".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                     Field {
                         label: "input_ref".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                 ],
             },
@@ -61740,12 +62685,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 13058, 13183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2281),
+            id: DeclarationId(2302),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "expected".to_string(),
-                    ty: DeclarationId(1300),
+                    ty: DeclarationId(1314),
                 }],
             },
             type_params: vec![],
@@ -61759,17 +62704,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 15236, 15297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2282),
+            id: DeclarationId(2303),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "expected".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                     Field {
                         label: "param".to_string(),
-                        ty: DeclarationId(1271),
+                        ty: DeclarationId(1286),
                     },
                 ],
             },
@@ -61784,21 +62729,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 15302, 15401),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2283),
+            id: DeclarationId(2304),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                     Field {
                         label: "comparator".to_string(),
-                        ty: DeclarationId(1265),
+                        ty: DeclarationId(1280),
                     },
                     Field {
                         label: "baseline_ref".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                 ],
             },
@@ -61813,17 +62758,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 15755, 15887),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2284),
+            id: DeclarationId(2305),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "left_report_ref".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                     Field {
                         label: "right_report_ref".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                 ],
             },
@@ -61838,17 +62783,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 16454, 16566),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2285),
+            id: DeclarationId(2306),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "law".to_string(),
-                        ty: DeclarationId(1266),
+                        ty: DeclarationId(1281),
                     },
                     Field {
                         label: "lens_ref".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                 ],
             },
@@ -61863,17 +62808,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 17263, 17342),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2286),
+            id: DeclarationId(2307),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                     Field {
                         label: "list_constant".to_string(),
-                        ty: DeclarationId(1252),
+                        ty: DeclarationId(1267),
                     },
                     Field {
                         label: "bound".to_string(),
@@ -61892,21 +62837,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 17562, 17675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2287),
+            id: DeclarationId(2308),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                     Field {
                         label: "list_constant".to_string(),
-                        ty: DeclarationId(1252),
+                        ty: DeclarationId(1267),
                     },
                     Field {
                         label: "subset_predicate".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                 ],
             },
@@ -61921,17 +62866,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 17680, 17816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2288),
+            id: DeclarationId(2309),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "compile_target".to_string(),
-                        ty: DeclarationId(1250),
+                        ty: DeclarationId(1265),
                     },
                     Field {
                         label: "expected".to_string(),
-                        ty: DeclarationId(1251),
+                        ty: DeclarationId(1266),
                     },
                 ],
             },
@@ -61946,17 +62891,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 18302, 18384),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2289),
+            id: DeclarationId(2310),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                     Field {
                         label: "ratchet_kind".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                 ],
             },
@@ -61971,13 +62916,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 18389, 18475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2290),
+            id: DeclarationId(2311),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1250),
+                    value: DeclarationId(1265),
                 }],
             },
             type_params: vec![],
@@ -61991,17 +62936,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 18554, 18564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2291),
+            id: DeclarationId(2312),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                     Field {
                         label: "generated_paths".to_string(),
-                        ty: DeclarationId(2290),
+                        ty: DeclarationId(2311),
                     },
                 ],
             },
@@ -62016,17 +62961,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 18480, 18570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2292),
+            id: DeclarationId(2313),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "capability_register".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                     Field {
                         label: "cementing_receipts".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                 ],
             },
@@ -62041,21 +62986,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 19784, 19909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2293),
+            id: DeclarationId(2314),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "deferred_gate".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                     Field {
                         label: "target_lane".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                     Field {
                         label: "authority_doc".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                 ],
             },
@@ -62070,21 +63015,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 20851, 20985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2294),
+            id: DeclarationId(2315),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "deferred_gate".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                     Field {
                         label: "target_lane".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                     Field {
                         label: "authority_doc".to_string(),
-                        ty: DeclarationId(1300),
+                        ty: DeclarationId(1314),
                     },
                 ],
             },
@@ -62099,12 +63044,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 21624, 21768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2295),
+            id: DeclarationId(2316),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "ledger".to_string(),
-                    ty: DeclarationId(918),
+                    ty: DeclarationId(868),
                 }],
             },
             type_params: vec![],
@@ -62118,13 +63063,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 22613, 22667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2296),
+            id: DeclarationId(2317),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1158),
+                    value: DeclarationId(948),
                 }],
             },
             type_params: vec![],
@@ -62138,7 +63083,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 23711, 23734),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2297),
+            id: DeclarationId(2318),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62152,7 +63097,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 23937, 23943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2298),
+            id: DeclarationId(2319),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62166,13 +63111,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 23948, 23954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2299),
+            id: DeclarationId(2320),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1158),
+                    value: DeclarationId(948),
                 }],
             },
             type_params: vec![],
@@ -62186,12 +63131,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 24092, 24115),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2300),
+            id: DeclarationId(2321),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1280),
+                    ty: DeclarationId(1295),
                 }],
             },
             type_params: vec![],
@@ -62205,12 +63150,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 25838, 25867),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2301),
+            id: DeclarationId(2322),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1282),
+                    ty: DeclarationId(1297),
                 }],
             },
             type_params: vec![],
@@ -62224,12 +63169,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 25872, 25911),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2302),
+            id: DeclarationId(2323),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1280),
+                    ty: DeclarationId(1295),
                 }],
             },
             type_params: vec![],
@@ -62243,12 +63188,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 26769, 26790),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2303),
+            id: DeclarationId(2324),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1282),
+                    ty: DeclarationId(1297),
                 }],
             },
             type_params: vec![],
@@ -62262,13 +63207,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 26795, 26826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2304),
+            id: DeclarationId(2325),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1285),
+                    value: DeclarationId(1300),
                 }],
             },
             type_params: vec![],
@@ -62282,13 +63227,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 26870, 26886),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2305),
+            id: DeclarationId(2326),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1158),
+                    value: DeclarationId(948),
                 }],
             },
             type_params: vec![],
@@ -62302,13 +63247,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 27142, 27165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2306),
+            id: DeclarationId(2327),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1275),
+                    value: DeclarationId(1290),
                 }],
             },
             type_params: vec![],
@@ -62322,27 +63267,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(2307),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(827),
-                }],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/workflows.dag", 992, 1006),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2308),
+            id: DeclarationId(2328),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62356,7 +63281,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(2309),
+            id: DeclarationId(2329),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62370,7 +63295,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(2310),
+            id: DeclarationId(2330),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62384,7 +63309,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(2311),
+            id: DeclarationId(2331),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -62403,7 +63328,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(2312),
+            id: DeclarationId(2332),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62417,7 +63342,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(2313),
+            id: DeclarationId(2333),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62431,7 +63356,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(2314),
+            id: DeclarationId(2334),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62445,7 +63370,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(2315),
+            id: DeclarationId(2335),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62459,7 +63384,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(2316),
+            id: DeclarationId(2336),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62473,7 +63398,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(2317),
+            id: DeclarationId(2337),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62487,7 +63412,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(2318),
+            id: DeclarationId(2338),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62501,7 +63426,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(2319),
+            id: DeclarationId(2339),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62515,7 +63440,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(2320),
+            id: DeclarationId(2340),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62529,7 +63454,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(2321),
+            id: DeclarationId(2341),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62543,7 +63468,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(2322),
+            id: DeclarationId(2342),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62557,7 +63482,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(2323),
+            id: DeclarationId(2343),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62571,7 +63496,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(2324),
+            id: DeclarationId(2344),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62585,7 +63510,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(2325),
+            id: DeclarationId(2345),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62599,7 +63524,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(2326),
+            id: DeclarationId(2346),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62613,7 +63538,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(2327),
+            id: DeclarationId(2347),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62623,11 +63548,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1338),
+                        ty: DeclarationId(1352),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1340),
+                        ty: DeclarationId(1354),
                     },
                     Field {
                         label: "range_min_inclusive".to_string(),
@@ -62643,7 +63568,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "overflow".to_string(),
-                        ty: DeclarationId(1341),
+                        ty: DeclarationId(1355),
                     },
                 ],
             },
@@ -62658,7 +63583,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(2328),
+            id: DeclarationId(2348),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62668,11 +63593,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1339),
+                        ty: DeclarationId(1353),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1340),
+                        ty: DeclarationId(1354),
                     },
                     Field {
                         label: "is_copy".to_string(),
@@ -62691,13 +63616,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(2329),
+            id: DeclarationId(2349),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1342),
+                    value: DeclarationId(1356),
                 }],
             },
             type_params: vec![],
@@ -62711,7 +63636,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(2330),
+            id: DeclarationId(2350),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62725,7 +63650,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(2331),
+            id: DeclarationId(2351),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62744,7 +63669,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(2332),
+            id: DeclarationId(2352),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -62764,12 +63689,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(2333),
+            id: DeclarationId(2353),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "values".to_string(),
-                    ty: DeclarationId(2332),
+                    ty: DeclarationId(2352),
                 }],
             },
             type_params: vec![],
@@ -62783,7 +63708,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(2334),
+            id: DeclarationId(2354),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62808,7 +63733,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(2335),
+            id: DeclarationId(2355),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62833,7 +63758,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(2336),
+            id: DeclarationId(2356),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62847,7 +63772,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(2337),
+            id: DeclarationId(2357),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62861,7 +63786,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(2338),
+            id: DeclarationId(2358),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62875,13 +63800,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(2339),
+            id: DeclarationId(2359),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1354),
+                    value: DeclarationId(1368),
                 }],
             },
             type_params: vec![],
@@ -62895,7 +63820,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(2340),
+            id: DeclarationId(2360),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -62914,7 +63839,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(2341),
+            id: DeclarationId(2361),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62928,7 +63853,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(2342),
+            id: DeclarationId(2362),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62942,7 +63867,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(2343),
+            id: DeclarationId(2363),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62956,7 +63881,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(2344),
+            id: DeclarationId(2364),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62970,7 +63895,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(2345),
+            id: DeclarationId(2365),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62984,7 +63909,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(2346),
+            id: DeclarationId(2366),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -63003,7 +63928,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(2347),
+            id: DeclarationId(2367),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63017,7 +63942,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(2348),
+            id: DeclarationId(2368),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63031,7 +63956,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(2349),
+            id: DeclarationId(2369),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63045,13 +63970,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(2350),
+            id: DeclarationId(2370),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1363),
+                    value: DeclarationId(1377),
                 }],
             },
             type_params: vec![],
@@ -63065,11 +63990,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(2351),
+            id: DeclarationId(2371),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1372),
+                    DeclarationId(1386),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63084,13 +64009,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(2352),
+            id: DeclarationId(2372),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1369),
+                    value: DeclarationId(1383),
                 }],
             },
             type_params: vec![],
@@ -63104,7 +64029,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(2353),
+            id: DeclarationId(2373),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -63130,11 +64055,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(2354),
+            id: DeclarationId(2374),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2353),
+                    DeclarationId(2373),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63149,11 +64074,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(2355),
+            id: DeclarationId(2375),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1361),
+                    DeclarationId(1375),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63168,7 +64093,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(2356),
+            id: DeclarationId(2376),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63182,7 +64107,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(2357),
+            id: DeclarationId(2377),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63196,7 +64121,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(2358),
+            id: DeclarationId(2378),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63210,7 +64135,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(2359),
+            id: DeclarationId(2379),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -63230,7 +64155,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(2360),
+            id: DeclarationId(2380),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -63250,17 +64175,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(2361),
+            id: DeclarationId(2381),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "branches".to_string(),
-                        ty: DeclarationId(2359),
+                        ty: DeclarationId(2379),
                     },
                     Field {
                         label: "paths".to_string(),
-                        ty: DeclarationId(2360),
+                        ty: DeclarationId(2380),
                     },
                 ],
             },
@@ -63275,7 +64200,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(2362),
+            id: DeclarationId(2382),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -63295,13 +64220,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(2363),
+            id: DeclarationId(2383),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1364),
+                    value: DeclarationId(1378),
                 }],
             },
             type_params: vec![],
@@ -63315,17 +64240,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(2364),
+            id: DeclarationId(2384),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "branches".to_string(),
-                        ty: DeclarationId(2362),
+                        ty: DeclarationId(2382),
                     },
                     Field {
                         label: "types".to_string(),
-                        ty: DeclarationId(2363),
+                        ty: DeclarationId(2383),
                     },
                 ],
             },
@@ -63340,12 +64265,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(2365),
+            id: DeclarationId(2385),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "cron".to_string(),
-                    ty: DeclarationId(1345),
+                    ty: DeclarationId(1359),
                 }],
             },
             type_params: vec![],
@@ -63359,13 +64284,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(2366),
+            id: DeclarationId(2386),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1365),
+                    value: DeclarationId(1379),
                 }],
             },
             type_params: vec![],
@@ -63379,12 +64304,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(2367),
+            id: DeclarationId(2387),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "inputs".to_string(),
-                    ty: DeclarationId(2366),
+                    ty: DeclarationId(2386),
                 }],
             },
             type_params: vec![],
@@ -63398,13 +64323,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(2368),
+            id: DeclarationId(2388),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1365),
+                    value: DeclarationId(1379),
                 }],
             },
             type_params: vec![],
@@ -63418,12 +64343,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(2369),
+            id: DeclarationId(2389),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "inputs".to_string(),
-                    ty: DeclarationId(2368),
+                    ty: DeclarationId(2388),
                 }],
             },
             type_params: vec![],
@@ -63437,7 +64362,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(2390),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63451,7 +64376,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(2391),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63465,7 +64390,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(2392),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63479,7 +64404,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(2373),
+            id: DeclarationId(2393),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63493,7 +64418,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(2374),
+            id: DeclarationId(2394),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63507,7 +64432,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(2375),
+            id: DeclarationId(2395),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -63526,7 +64451,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(2376),
+            id: DeclarationId(2396),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -63545,7 +64470,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(2397),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63559,7 +64484,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(2398),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63573,7 +64498,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(2399),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63587,7 +64512,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(2400),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63601,7 +64526,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(2401),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63615,7 +64540,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(2402),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63629,7 +64554,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(2403),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63643,7 +64568,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(2384),
+            id: DeclarationId(2404),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -63662,13 +64587,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(2385),
+            id: DeclarationId(2405),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1375),
+                    value: DeclarationId(1389),
                 }],
             },
             type_params: vec![],
@@ -63682,7 +64607,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(2386),
+            id: DeclarationId(2406),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -63702,7 +64627,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(2387),
+            id: DeclarationId(2407),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -63728,11 +64653,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(2408),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2387),
+                    DeclarationId(2407),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63747,7 +64672,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(2409),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -63773,11 +64698,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(2390),
+            id: DeclarationId(2410),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2389),
+                    DeclarationId(2409),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63792,7 +64717,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(2391),
+            id: DeclarationId(2411),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -63811,11 +64736,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(2392),
+            id: DeclarationId(2412),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1391),
+                    DeclarationId(1405),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63830,7 +64755,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(2393),
+            id: DeclarationId(2413),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -63849,11 +64774,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(2394),
+            id: DeclarationId(2414),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1372),
+                    DeclarationId(1386),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63868,7 +64793,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(2395),
+            id: DeclarationId(2415),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63887,7 +64812,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(2396),
+            id: DeclarationId(2416),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63906,7 +64831,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(2397),
+            id: DeclarationId(2417),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63920,7 +64845,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(2398),
+            id: DeclarationId(2418),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63939,7 +64864,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(2399),
+            id: DeclarationId(2419),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63958,11 +64883,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(2400),
+            id: DeclarationId(2420),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1371),
+                    DeclarationId(1385),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63977,7 +64902,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(2401),
+            id: DeclarationId(2421),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -63987,7 +64912,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "cancel_in_progress".to_string(),
-                        ty: DeclarationId(2400),
+                        ty: DeclarationId(2420),
                     },
                 ],
             },
@@ -64002,11 +64927,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(2402),
+            id: DeclarationId(2422),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1370),
+                    DeclarationId(1384),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64021,7 +64946,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(2403),
+            id: DeclarationId(2423),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64040,7 +64965,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(2404),
+            id: DeclarationId(2424),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64050,11 +64975,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "cancel_in_progress".to_string(),
-                        ty: DeclarationId(2402),
+                        ty: DeclarationId(2422),
                     },
                     Field {
                         label: "explicit_single".to_string(),
-                        ty: DeclarationId(2403),
+                        ty: DeclarationId(2423),
                     },
                 ],
             },
@@ -64069,12 +64994,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(2405),
+            id: DeclarationId(2425),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "label".to_string(),
-                    ty: DeclarationId(1374),
+                    ty: DeclarationId(1388),
                 }],
             },
             type_params: vec![],
@@ -64088,7 +65013,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(2406),
+            id: DeclarationId(2426),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -64108,12 +65033,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(2407),
+            id: DeclarationId(2427),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "labels".to_string(),
-                    ty: DeclarationId(2406),
+                    ty: DeclarationId(2426),
                 }],
             },
             type_params: vec![],
@@ -64127,7 +65052,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(2408),
+            id: DeclarationId(2428),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -64146,7 +65071,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(2409),
+            id: DeclarationId(2429),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64160,7 +65085,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(2410),
+            id: DeclarationId(2430),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64174,7 +65099,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(2411),
+            id: DeclarationId(2431),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64188,7 +65113,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(2412),
+            id: DeclarationId(2432),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64202,7 +65127,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(2413),
+            id: DeclarationId(2433),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64216,7 +65141,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(2414),
+            id: DeclarationId(2434),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64230,7 +65155,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(2415),
+            id: DeclarationId(2435),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64249,7 +65174,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(2416),
+            id: DeclarationId(2436),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64268,7 +65193,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(2417),
+            id: DeclarationId(2437),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -64294,11 +65219,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(2418),
+            id: DeclarationId(2438),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2417),
+                    DeclarationId(2437),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64313,7 +65238,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(2419),
+            id: DeclarationId(2439),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64332,7 +65257,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(2420),
+            id: DeclarationId(2440),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64351,7 +65276,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(2421),
+            id: DeclarationId(2441),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64370,17 +65295,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(2422),
+            id: DeclarationId(2442),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(2415),
+                        ty: DeclarationId(2435),
                     },
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(2416),
+                        ty: DeclarationId(2436),
                     },
                     Field {
                         label: "run".to_string(),
@@ -64388,19 +65313,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "shell".to_string(),
-                        ty: DeclarationId(1376),
+                        ty: DeclarationId(1390),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2418),
+                        ty: DeclarationId(2438),
                     },
                     Field {
                         label: "working_directory".to_string(),
-                        ty: DeclarationId(2419),
+                        ty: DeclarationId(2439),
                     },
                     Field {
                         label: "if_condition".to_string(),
-                        ty: DeclarationId(2420),
+                        ty: DeclarationId(2440),
                     },
                     Field {
                         label: "continue_on_error".to_string(),
@@ -64408,7 +65333,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "timeout_minutes".to_string(),
-                        ty: DeclarationId(2421),
+                        ty: DeclarationId(2441),
                     },
                 ],
             },
@@ -64423,7 +65348,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(2423),
+            id: DeclarationId(2443),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64442,7 +65367,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(2424),
+            id: DeclarationId(2444),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64461,7 +65386,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(2425),
+            id: DeclarationId(2445),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -64487,11 +65412,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(2426),
+            id: DeclarationId(2446),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2425),
+                    DeclarationId(2445),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64506,7 +65431,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(2427),
+            id: DeclarationId(2447),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -64532,11 +65457,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(2428),
+            id: DeclarationId(2448),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2427),
+                    DeclarationId(2447),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64551,7 +65476,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(2429),
+            id: DeclarationId(2449),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64570,7 +65495,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(2430),
+            id: DeclarationId(2450),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64589,33 +65514,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(2431),
+            id: DeclarationId(2451),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(2423),
+                        ty: DeclarationId(2443),
                     },
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(2424),
+                        ty: DeclarationId(2444),
                     },
                     Field {
                         label: "uses".to_string(),
-                        ty: DeclarationId(1377),
+                        ty: DeclarationId(1391),
                     },
                     Field {
                         label: "with".to_string(),
-                        ty: DeclarationId(2426),
+                        ty: DeclarationId(2446),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2428),
+                        ty: DeclarationId(2448),
                     },
                     Field {
                         label: "if_condition".to_string(),
-                        ty: DeclarationId(2429),
+                        ty: DeclarationId(2449),
                     },
                     Field {
                         label: "continue_on_error".to_string(),
@@ -64623,7 +65548,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "timeout_minutes".to_string(),
-                        ty: DeclarationId(2430),
+                        ty: DeclarationId(2450),
                     },
                 ],
             },
@@ -64638,7 +65563,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(2432),
+            id: DeclarationId(2452),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64652,7 +65577,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(2433),
+            id: DeclarationId(2453),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64666,7 +65591,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(2434),
+            id: DeclarationId(2454),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64680,7 +65605,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(2435),
+            id: DeclarationId(2455),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64694,7 +65619,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(2436),
+            id: DeclarationId(2456),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64708,7 +65633,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(2437),
+            id: DeclarationId(2457),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64727,7 +65652,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(2438),
+            id: DeclarationId(2458),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64746,7 +65671,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(2439),
+            id: DeclarationId(2459),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64765,7 +65690,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(2440),
+            id: DeclarationId(2460),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64775,15 +65700,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "file".to_string(),
-                        ty: DeclarationId(2437),
+                        ty: DeclarationId(2457),
                     },
                     Field {
                         label: "line".to_string(),
-                        ty: DeclarationId(2438),
+                        ty: DeclarationId(2458),
                     },
                     Field {
                         label: "col".to_string(),
-                        ty: DeclarationId(2439),
+                        ty: DeclarationId(2459),
                     },
                 ],
             },
@@ -64798,7 +65723,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(2441),
+            id: DeclarationId(2461),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64817,7 +65742,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(2442),
+            id: DeclarationId(2462),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64836,7 +65761,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(2443),
+            id: DeclarationId(2463),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64855,7 +65780,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(2444),
+            id: DeclarationId(2464),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64865,15 +65790,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "file".to_string(),
-                        ty: DeclarationId(2441),
+                        ty: DeclarationId(2461),
                     },
                     Field {
                         label: "line".to_string(),
-                        ty: DeclarationId(2442),
+                        ty: DeclarationId(2462),
                     },
                     Field {
                         label: "col".to_string(),
-                        ty: DeclarationId(2443),
+                        ty: DeclarationId(2463),
                     },
                 ],
             },
@@ -64888,7 +65813,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(2445),
+            id: DeclarationId(2465),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64907,7 +65832,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(2446),
+            id: DeclarationId(2466),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64926,7 +65851,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(2447),
+            id: DeclarationId(2467),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64945,7 +65870,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(2448),
+            id: DeclarationId(2468),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64955,15 +65880,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "file".to_string(),
-                        ty: DeclarationId(2445),
+                        ty: DeclarationId(2465),
                     },
                     Field {
                         label: "line".to_string(),
-                        ty: DeclarationId(2446),
+                        ty: DeclarationId(2466),
                     },
                     Field {
                         label: "col".to_string(),
-                        ty: DeclarationId(2447),
+                        ty: DeclarationId(2467),
                     },
                 ],
             },
@@ -64978,7 +65903,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(2449),
+            id: DeclarationId(2469),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -64997,7 +65922,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(2450),
+            id: DeclarationId(2470),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65011,7 +65936,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(2451),
+            id: DeclarationId(2471),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65036,7 +65961,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(2452),
+            id: DeclarationId(2472),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65055,7 +65980,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(2453),
+            id: DeclarationId(2473),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65074,7 +65999,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(2454),
+            id: DeclarationId(2474),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -65093,7 +66018,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(2455),
+            id: DeclarationId(2475),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65107,11 +66032,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "retention_days".to_string(),
-                        ty: DeclarationId(2454),
+                        ty: DeclarationId(2474),
                     },
                     Field {
                         label: "if_no_files_found".to_string(),
-                        ty: DeclarationId(1388),
+                        ty: DeclarationId(1402),
                     },
                 ],
             },
@@ -65126,7 +66051,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(2456),
+            id: DeclarationId(2476),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -65145,7 +66070,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(2457),
+            id: DeclarationId(2477),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65155,7 +66080,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(2456),
+                        ty: DeclarationId(2476),
                     },
                 ],
             },
@@ -65170,7 +66095,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(2458),
+            id: DeclarationId(2478),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65184,7 +66109,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(2459),
+            id: DeclarationId(2479),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65198,7 +66123,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(2460),
+            id: DeclarationId(2480),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65212,7 +66137,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(2461),
+            id: DeclarationId(2481),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -65232,7 +66157,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(2462),
+            id: DeclarationId(2482),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -65243,7 +66168,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     TemplateArgument {
                         parameter: DeclarationId(139),
-                        value: DeclarationId(2461),
+                        value: DeclarationId(2481),
                     },
                 ],
             },
@@ -65258,7 +66183,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(2463),
+            id: DeclarationId(2483),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -65284,13 +66209,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(2484),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2463),
+                    value: DeclarationId(2483),
                 }],
             },
             type_params: vec![],
@@ -65304,7 +66229,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(2485),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -65330,13 +66255,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(2466),
+            id: DeclarationId(2486),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2465),
+                    value: DeclarationId(2485),
                 }],
             },
             type_params: vec![],
@@ -65350,7 +66275,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(2467),
+            id: DeclarationId(2487),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -65369,7 +66294,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(2468),
+            id: DeclarationId(2488),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65383,7 +66308,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(2469),
+            id: DeclarationId(2489),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65397,7 +66322,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(2470),
+            id: DeclarationId(2490),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65411,7 +66336,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(2471),
+            id: DeclarationId(2491),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65425,7 +66350,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(2472),
+            id: DeclarationId(2492),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65439,7 +66364,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(2473),
+            id: DeclarationId(2493),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65453,7 +66378,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(2474),
+            id: DeclarationId(2494),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65467,7 +66392,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(2475),
+            id: DeclarationId(2495),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65481,12 +66406,12 @@ 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(2476),
+            id: DeclarationId(2496),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(151)],
                 output: DeclarationId(128),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(855))),
+                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(887))),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -65499,7 +66424,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(2477),
+            id: DeclarationId(2497),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65518,7 +66443,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(2478),
+            id: DeclarationId(2498),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65532,17 +66457,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(2479),
+            id: DeclarationId(2499),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2477),
+                        ty: DeclarationId(2497),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2478),
+                        ty: DeclarationId(2498),
                     },
                 ],
             },
@@ -65557,7 +66482,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(2480),
+            id: DeclarationId(2500),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65576,7 +66501,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(2481),
+            id: DeclarationId(2501),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65590,17 +66515,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(2482),
+            id: DeclarationId(2502),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2480),
+                        ty: DeclarationId(2500),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2481),
+                        ty: DeclarationId(2501),
                     },
                 ],
             },
@@ -65615,7 +66540,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(2483),
+            id: DeclarationId(2503),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65634,7 +66559,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(2484),
+            id: DeclarationId(2504),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65648,17 +66573,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(2485),
+            id: DeclarationId(2505),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2483),
+                        ty: DeclarationId(2503),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2484),
+                        ty: DeclarationId(2504),
                     },
                 ],
             },
@@ -65673,7 +66598,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(2486),
+            id: DeclarationId(2506),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65692,7 +66617,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(2487),
+            id: DeclarationId(2507),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65706,17 +66631,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(2488),
+            id: DeclarationId(2508),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2486),
+                        ty: DeclarationId(2506),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2487),
+                        ty: DeclarationId(2507),
                     },
                 ],
             },
@@ -65731,7 +66656,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(2489),
+            id: DeclarationId(2509),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65750,7 +66675,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(2490),
+            id: DeclarationId(2510),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65764,17 +66689,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(2491),
+            id: DeclarationId(2511),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2489),
+                        ty: DeclarationId(2509),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2490),
+                        ty: DeclarationId(2510),
                     },
                 ],
             },
@@ -65789,7 +66714,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(2492),
+            id: DeclarationId(2512),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65808,7 +66733,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(2493),
+            id: DeclarationId(2513),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65822,17 +66747,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(2494),
+            id: DeclarationId(2514),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2492),
+                        ty: DeclarationId(2512),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2493),
+                        ty: DeclarationId(2513),
                     },
                 ],
             },
@@ -65847,7 +66772,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(2495),
+            id: DeclarationId(2515),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65866,7 +66791,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(2496),
+            id: DeclarationId(2516),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65880,17 +66805,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(2497),
+            id: DeclarationId(2517),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2495),
+                        ty: DeclarationId(2515),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2496),
+                        ty: DeclarationId(2516),
                     },
                 ],
             },
@@ -65905,7 +66830,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(2498),
+            id: DeclarationId(2518),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65924,7 +66849,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(2499),
+            id: DeclarationId(2519),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65938,17 +66863,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(2500),
+            id: DeclarationId(2520),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2498),
+                        ty: DeclarationId(2518),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2499),
+                        ty: DeclarationId(2519),
                     },
                 ],
             },
@@ -65963,7 +66888,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(2501),
+            id: DeclarationId(2521),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65982,7 +66907,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(2502),
+            id: DeclarationId(2522),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65996,17 +66921,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(2503),
+            id: DeclarationId(2523),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2501),
+                        ty: DeclarationId(2521),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2502),
+                        ty: DeclarationId(2522),
                     },
                 ],
             },
@@ -66021,7 +66946,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(2504),
+            id: DeclarationId(2524),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66040,7 +66965,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(2505),
+            id: DeclarationId(2525),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66054,17 +66979,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(2506),
+            id: DeclarationId(2526),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2504),
+                        ty: DeclarationId(2524),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2505),
+                        ty: DeclarationId(2525),
                     },
                 ],
             },
@@ -66079,7 +67004,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(2507),
+            id: DeclarationId(2527),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66098,7 +67023,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(2508),
+            id: DeclarationId(2528),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66112,17 +67037,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(2509),
+            id: DeclarationId(2529),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2507),
+                        ty: DeclarationId(2527),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2508),
+                        ty: DeclarationId(2528),
                     },
                 ],
             },
@@ -66137,7 +67062,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(2510),
+            id: DeclarationId(2530),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66156,7 +67081,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(2511),
+            id: DeclarationId(2531),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66170,17 +67095,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(2512),
+            id: DeclarationId(2532),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2510),
+                        ty: DeclarationId(2530),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2511),
+                        ty: DeclarationId(2531),
                     },
                 ],
             },
@@ -66195,7 +67120,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(2513),
+            id: DeclarationId(2533),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66214,7 +67139,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(2514),
+            id: DeclarationId(2534),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66228,17 +67153,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(2515),
+            id: DeclarationId(2535),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2513),
+                        ty: DeclarationId(2533),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2514),
+                        ty: DeclarationId(2534),
                     },
                 ],
             },
@@ -66253,7 +67178,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(2516),
+            id: DeclarationId(2536),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66272,7 +67197,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(2517),
+            id: DeclarationId(2537),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66286,17 +67211,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(2518),
+            id: DeclarationId(2538),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2516),
+                        ty: DeclarationId(2536),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2517),
+                        ty: DeclarationId(2537),
                     },
                 ],
             },
@@ -66311,7 +67236,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(2519),
+            id: DeclarationId(2539),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66330,7 +67255,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(2520),
+            id: DeclarationId(2540),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66344,17 +67269,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(2521),
+            id: DeclarationId(2541),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2519),
+                        ty: DeclarationId(2539),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2520),
+                        ty: DeclarationId(2540),
                     },
                 ],
             },
@@ -66369,7 +67294,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(2522),
+            id: DeclarationId(2542),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66388,7 +67313,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(2523),
+            id: DeclarationId(2543),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66402,17 +67327,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(2524),
+            id: DeclarationId(2544),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2522),
+                        ty: DeclarationId(2542),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2523),
+                        ty: DeclarationId(2543),
                     },
                 ],
             },
@@ -66427,7 +67352,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(2525),
+            id: DeclarationId(2545),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66446,7 +67371,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(2546),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66460,17 +67385,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(2527),
+            id: DeclarationId(2547),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2525),
+                        ty: DeclarationId(2545),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2526),
+                        ty: DeclarationId(2546),
                     },
                 ],
             },
@@ -66485,7 +67410,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(2528),
+            id: DeclarationId(2548),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66504,7 +67429,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(2529),
+            id: DeclarationId(2549),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66518,17 +67443,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(2530),
+            id: DeclarationId(2550),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2528),
+                        ty: DeclarationId(2548),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2529),
+                        ty: DeclarationId(2549),
                     },
                 ],
             },
@@ -66543,7 +67468,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(2531),
+            id: DeclarationId(2551),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66562,7 +67487,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(2532),
+            id: DeclarationId(2552),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66576,17 +67501,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(2533),
+            id: DeclarationId(2553),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2531),
+                        ty: DeclarationId(2551),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2532),
+                        ty: DeclarationId(2552),
                     },
                 ],
             },
@@ -66601,7 +67526,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(2534),
+            id: DeclarationId(2554),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66620,7 +67545,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(2535),
+            id: DeclarationId(2555),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66634,17 +67559,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(2536),
+            id: DeclarationId(2556),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2534),
+                        ty: DeclarationId(2554),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2535),
+                        ty: DeclarationId(2555),
                     },
                 ],
             },
@@ -66659,7 +67584,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(2537),
+            id: DeclarationId(2557),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66678,7 +67603,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(2538),
+            id: DeclarationId(2558),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66692,17 +67617,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(2539),
+            id: DeclarationId(2559),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2537),
+                        ty: DeclarationId(2557),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2538),
+                        ty: DeclarationId(2558),
                     },
                 ],
             },
@@ -66717,7 +67642,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(2540),
+            id: DeclarationId(2560),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66736,7 +67661,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(2541),
+            id: DeclarationId(2561),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66750,17 +67675,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(2542),
+            id: DeclarationId(2562),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2540),
+                        ty: DeclarationId(2560),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2541),
+                        ty: DeclarationId(2561),
                     },
                 ],
             },
@@ -66775,7 +67700,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(2543),
+            id: DeclarationId(2563),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66794,7 +67719,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(2544),
+            id: DeclarationId(2564),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66808,17 +67733,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(2545),
+            id: DeclarationId(2565),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2543),
+                        ty: DeclarationId(2563),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2544),
+                        ty: DeclarationId(2564),
                     },
                 ],
             },
@@ -66833,12 +67758,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(2546),
+            id: DeclarationId(2566),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1442),
+                    ty: DeclarationId(1456),
                 }],
             },
             type_params: vec![],
@@ -66852,7 +67777,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(2547),
+            id: DeclarationId(2567),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66866,17 +67791,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(2548),
+            id: DeclarationId(2568),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2546),
+                        ty: DeclarationId(2566),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2547),
+                        ty: DeclarationId(2567),
                     },
                 ],
             },
@@ -66891,12 +67816,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(2549),
+            id: DeclarationId(2569),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1445),
+                    ty: DeclarationId(1459),
                 }],
             },
             type_params: vec![],
@@ -66910,7 +67835,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(2550),
+            id: DeclarationId(2570),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66924,17 +67849,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(2551),
+            id: DeclarationId(2571),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2549),
+                        ty: DeclarationId(2569),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2550),
+                        ty: DeclarationId(2570),
                     },
                 ],
             },
@@ -66949,7 +67874,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(2552),
+            id: DeclarationId(2572),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66968,7 +67893,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(2553),
+            id: DeclarationId(2573),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66982,17 +67907,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(2554),
+            id: DeclarationId(2574),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2552),
+                        ty: DeclarationId(2572),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2553),
+                        ty: DeclarationId(2573),
                     },
                 ],
             },
@@ -67007,7 +67932,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(2555),
+            id: DeclarationId(2575),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67026,7 +67951,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(2556),
+            id: DeclarationId(2576),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67040,17 +67965,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(2557),
+            id: DeclarationId(2577),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2555),
+                        ty: DeclarationId(2575),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2556),
+                        ty: DeclarationId(2576),
                     },
                 ],
             },
@@ -67065,7 +67990,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(2558),
+            id: DeclarationId(2578),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67084,7 +68009,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(2559),
+            id: DeclarationId(2579),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67098,17 +68023,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(2560),
+            id: DeclarationId(2580),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2558),
+                        ty: DeclarationId(2578),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2559),
+                        ty: DeclarationId(2579),
                     },
                 ],
             },
@@ -67123,7 +68048,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(2561),
+            id: DeclarationId(2581),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67142,7 +68067,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(2562),
+            id: DeclarationId(2582),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67156,17 +68081,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(2563),
+            id: DeclarationId(2583),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2561),
+                        ty: DeclarationId(2581),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2562),
+                        ty: DeclarationId(2582),
                     },
                 ],
             },
@@ -67181,7 +68106,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(2564),
+            id: DeclarationId(2584),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67200,7 +68125,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(2565),
+            id: DeclarationId(2585),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67214,17 +68139,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(2566),
+            id: DeclarationId(2586),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2564),
+                        ty: DeclarationId(2584),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2565),
+                        ty: DeclarationId(2585),
                     },
                 ],
             },
@@ -67239,7 +68164,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(2567),
+            id: DeclarationId(2587),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67258,7 +68183,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(2568),
+            id: DeclarationId(2588),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67272,17 +68197,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(2569),
+            id: DeclarationId(2589),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2567),
+                        ty: DeclarationId(2587),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2568),
+                        ty: DeclarationId(2588),
                     },
                 ],
             },
@@ -67297,7 +68222,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(2570),
+            id: DeclarationId(2590),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67316,7 +68241,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(2571),
+            id: DeclarationId(2591),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67330,17 +68255,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(2572),
+            id: DeclarationId(2592),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2570),
+                        ty: DeclarationId(2590),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2571),
+                        ty: DeclarationId(2591),
                     },
                 ],
             },
@@ -67355,7 +68280,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(2573),
+            id: DeclarationId(2593),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67374,7 +68299,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(2574),
+            id: DeclarationId(2594),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67388,17 +68313,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(2575),
+            id: DeclarationId(2595),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2573),
+                        ty: DeclarationId(2593),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2574),
+                        ty: DeclarationId(2594),
                     },
                 ],
             },
@@ -67413,7 +68338,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(2576),
+            id: DeclarationId(2596),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67432,7 +68357,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(2577),
+            id: DeclarationId(2597),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67446,17 +68371,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(2578),
+            id: DeclarationId(2598),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2576),
+                        ty: DeclarationId(2596),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2577),
+                        ty: DeclarationId(2597),
                     },
                 ],
             },
@@ -67471,7 +68396,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(2579),
+            id: DeclarationId(2599),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67490,7 +68415,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(2580),
+            id: DeclarationId(2600),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67504,17 +68429,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(2581),
+            id: DeclarationId(2601),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2579),
+                        ty: DeclarationId(2599),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2580),
+                        ty: DeclarationId(2600),
                     },
                 ],
             },
@@ -67529,7 +68454,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(2582),
+            id: DeclarationId(2602),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67548,7 +68473,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(2583),
+            id: DeclarationId(2603),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67562,17 +68487,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(2584),
+            id: DeclarationId(2604),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2582),
+                        ty: DeclarationId(2602),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2583),
+                        ty: DeclarationId(2603),
                     },
                 ],
             },
@@ -67587,7 +68512,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(2585),
+            id: DeclarationId(2605),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67606,7 +68531,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(2586),
+            id: DeclarationId(2606),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67620,17 +68545,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(2587),
+            id: DeclarationId(2607),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2585),
+                        ty: DeclarationId(2605),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2586),
+                        ty: DeclarationId(2606),
                     },
                 ],
             },
@@ -67645,7 +68570,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(2588),
+            id: DeclarationId(2608),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67664,7 +68589,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(2589),
+            id: DeclarationId(2609),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67678,17 +68603,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(2590),
+            id: DeclarationId(2610),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2588),
+                        ty: DeclarationId(2608),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2589),
+                        ty: DeclarationId(2609),
                     },
                 ],
             },
@@ -67703,7 +68628,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(2591),
+            id: DeclarationId(2611),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67722,7 +68647,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(2592),
+            id: DeclarationId(2612),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67736,17 +68661,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(2593),
+            id: DeclarationId(2613),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2591),
+                        ty: DeclarationId(2611),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2592),
+                        ty: DeclarationId(2612),
                     },
                 ],
             },
@@ -67761,7 +68686,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(2594),
+            id: DeclarationId(2614),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67780,7 +68705,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(2595),
+            id: DeclarationId(2615),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67794,17 +68719,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(2596),
+            id: DeclarationId(2616),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2594),
+                        ty: DeclarationId(2614),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2595),
+                        ty: DeclarationId(2615),
                     },
                 ],
             },
@@ -67819,7 +68744,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(2597),
+            id: DeclarationId(2617),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67838,7 +68763,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(2598),
+            id: DeclarationId(2618),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67852,17 +68777,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(2599),
+            id: DeclarationId(2619),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2597),
+                        ty: DeclarationId(2617),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2598),
+                        ty: DeclarationId(2618),
                     },
                 ],
             },
@@ -67877,7 +68802,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(2600),
+            id: DeclarationId(2620),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67896,7 +68821,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(2601),
+            id: DeclarationId(2621),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67910,17 +68835,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(2602),
+            id: DeclarationId(2622),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2600),
+                        ty: DeclarationId(2620),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2601),
+                        ty: DeclarationId(2621),
                     },
                 ],
             },
@@ -67935,7 +68860,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(2603),
+            id: DeclarationId(2623),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67954,7 +68879,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(2604),
+            id: DeclarationId(2624),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67968,17 +68893,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(2605),
+            id: DeclarationId(2625),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2603),
+                        ty: DeclarationId(2623),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2604),
+                        ty: DeclarationId(2624),
                     },
                 ],
             },
@@ -67993,7 +68918,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(2606),
+            id: DeclarationId(2626),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68012,7 +68937,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(2607),
+            id: DeclarationId(2627),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68026,17 +68951,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(2608),
+            id: DeclarationId(2628),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2606),
+                        ty: DeclarationId(2626),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2607),
+                        ty: DeclarationId(2627),
                     },
                 ],
             },
@@ -68051,7 +68976,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(2609),
+            id: DeclarationId(2629),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68070,7 +68995,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(2610),
+            id: DeclarationId(2630),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68084,17 +69009,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(2611),
+            id: DeclarationId(2631),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2609),
+                        ty: DeclarationId(2629),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2610),
+                        ty: DeclarationId(2630),
                     },
                 ],
             },
@@ -68109,12 +69034,12 @@ 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(2612),
+            id: DeclarationId(2632),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(842),
+                    ty: DeclarationId(846),
                 }],
             },
             type_params: vec![],
@@ -68125,10 +69050,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2613),
+            id: DeclarationId(2633),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68139,20 +69064,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/algebra.dag", 6780, 6801),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2614),
+            id: DeclarationId(2634),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2612),
+                        ty: DeclarationId(2632),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2613),
+                        ty: DeclarationId(2633),
                     },
                 ],
             },
@@ -68164,15 +69089,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/algebra.dag", 6780, 6801),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2615),
+            id: DeclarationId(2635),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(843),
+                    ty: DeclarationId(845),
                 }],
             },
             type_params: vec![],
@@ -68183,10 +69108,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2616),
+            id: DeclarationId(2636),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68197,20 +69122,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/algebra.dag", 6816, 6826),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2617),
+            id: DeclarationId(2637),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2615),
+                        ty: DeclarationId(2635),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2616),
+                        ty: DeclarationId(2636),
                     },
                 ],
             },
@@ -68222,15 +69147,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/algebra.dag", 6816, 6826),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2618),
+            id: DeclarationId(2638),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(93),
+                    ty: DeclarationId(847),
                 }],
             },
             type_params: vec![],
@@ -68241,10 +69166,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2619),
+            id: DeclarationId(2639),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68255,20 +69180,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/algebra.dag", 6856, 6860),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2620),
+            id: DeclarationId(2640),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2618),
+                        ty: DeclarationId(2638),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2619),
+                        ty: DeclarationId(2639),
                     },
                 ],
             },
@@ -68280,15 +69205,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/algebra.dag", 6856, 6860),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2621),
+            id: DeclarationId(2641),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(128),
                 }],
             },
             type_params: vec![],
@@ -68299,10 +69224,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2622),
+            id: DeclarationId(2642),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68313,20 +69238,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/algebra.dag", 7429, 7436),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2623),
+            id: DeclarationId(2643),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2621),
+                        ty: DeclarationId(2641),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2622),
+                        ty: DeclarationId(2642),
                     },
                 ],
             },
@@ -68338,15 +69263,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/algebra.dag", 7429, 7436),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2624),
+            id: DeclarationId(2644),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(115),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -68357,10 +69282,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2625),
+            id: DeclarationId(2645),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68371,20 +69296,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/anthropic_messages.dag", 4566, 4572),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2626),
+            id: DeclarationId(2646),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2624),
+                        ty: DeclarationId(2644),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2625),
+                        ty: DeclarationId(2645),
                     },
                 ],
             },
@@ -68396,10 +69321,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2627),
+            id: DeclarationId(2647),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68415,10 +69340,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2628),
+            id: DeclarationId(2648),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68429,20 +69354,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/anthropic_messages.dag", 4589, 4596),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2629),
+            id: DeclarationId(2649),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2627),
+                        ty: DeclarationId(2647),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2628),
+                        ty: DeclarationId(2648),
                     },
                 ],
             },
@@ -68454,15 +69379,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/anthropic_messages.dag", 4589, 4596),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2630),
+            id: DeclarationId(2650),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(897),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -68473,10 +69398,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2631),
+            id: DeclarationId(2651),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68487,20 +69412,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/anthropic_schema.dag", 6286, 6323),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2632),
+            id: DeclarationId(2652),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2630),
+                        ty: DeclarationId(2650),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2631),
+                        ty: DeclarationId(2651),
                     },
                 ],
             },
@@ -68512,15 +69437,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/anthropic_schema.dag", 6286, 6323),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2633),
+            id: DeclarationId(2653),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(896),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -68531,10 +69456,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2634),
+            id: DeclarationId(2654),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68545,20 +69470,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/anthropic_schema.dag", 6345, 6358),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2635),
+            id: DeclarationId(2655),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2633),
+                        ty: DeclarationId(2653),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2634),
+                        ty: DeclarationId(2654),
                     },
                 ],
             },
@@ -68570,15 +69495,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/anthropic_schema.dag", 6345, 6358),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2636),
+            id: DeclarationId(2656),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(898),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -68589,10 +69514,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2637),
+            id: DeclarationId(2657),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68603,20 +69528,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/anthropic_schema.dag", 7030, 7057),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2638),
+            id: DeclarationId(2658),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2636),
+                        ty: DeclarationId(2656),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2637),
+                        ty: DeclarationId(2657),
                     },
                 ],
             },
@@ -68628,15 +69553,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/anthropic_schema.dag", 7030, 7057),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2639),
+            id: DeclarationId(2659),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(128),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -68647,10 +69572,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2640),
+            id: DeclarationId(2660),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68661,20 +69586,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/anthropic_schema.dag", 7074, 7079),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2641),
+            id: DeclarationId(2661),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2639),
+                        ty: DeclarationId(2659),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2640),
+                        ty: DeclarationId(2660),
                     },
                 ],
             },
@@ -68686,10 +69611,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2642),
+            id: DeclarationId(2662),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68705,10 +69630,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2643),
+            id: DeclarationId(2663),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68719,20 +69644,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/anthropic_schema.dag", 8435, 8442),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2644),
+            id: DeclarationId(2664),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2642),
+                        ty: DeclarationId(2662),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2643),
+                        ty: DeclarationId(2663),
                     },
                 ],
             },
@@ -68744,10 +69669,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2645),
+            id: DeclarationId(2665),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68763,10 +69688,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2646),
+            id: DeclarationId(2666),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68777,20 +69702,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/anthropic_schema.dag", 8453, 8460),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2647),
+            id: DeclarationId(2667),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2645),
+                        ty: DeclarationId(2665),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2646),
+                        ty: DeclarationId(2666),
                     },
                 ],
             },
@@ -68802,15 +69727,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/anthropic_schema.dag", 8453, 8460),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2648),
+            id: DeclarationId(2668),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(1687),
                 }],
             },
             type_params: vec![],
@@ -68821,10 +69746,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2649),
+            id: DeclarationId(2669),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68835,20 +69760,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/anthropic_schema.dag", 8583, 8590),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2650),
+            id: DeclarationId(2670),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2648),
+                        ty: DeclarationId(2668),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2649),
+                        ty: DeclarationId(2669),
                     },
                 ],
             },
@@ -68860,15 +69785,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/anthropic_schema.dag", 8583, 8590),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2651),
+            id: DeclarationId(2671),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(130),
                 }],
             },
             type_params: vec![],
@@ -68879,10 +69804,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2652),
+            id: DeclarationId(2672),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68893,20 +69818,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/anthropic_schema.dag", 8601, 8608),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2653),
+            id: DeclarationId(2673),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2651),
+                        ty: DeclarationId(2671),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2652),
+                        ty: DeclarationId(2672),
                     },
                 ],
             },
@@ -68918,15 +69843,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/anthropic_schema.dag", 8601, 8608),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2654),
+            id: DeclarationId(2674),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(130),
                 }],
             },
             type_params: vec![],
@@ -68937,10 +69862,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2655),
+            id: DeclarationId(2675),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68951,20 +69876,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/anthropic_schema.dag", 8741, 8748),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2656),
+            id: DeclarationId(2676),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2654),
+                        ty: DeclarationId(2674),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2655),
+                        ty: DeclarationId(2675),
                     },
                 ],
             },
@@ -68976,15 +69901,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/anthropic_schema.dag", 8741, 8748),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2657),
+            id: DeclarationId(2677),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(130),
                 }],
             },
             type_params: vec![],
@@ -68995,10 +69920,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2658),
+            id: DeclarationId(2678),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69009,20 +69934,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/anthropic_schema.dag", 8759, 8766),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2659),
+            id: DeclarationId(2679),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2657),
+                        ty: DeclarationId(2677),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2658),
+                        ty: DeclarationId(2678),
                     },
                 ],
             },
@@ -69034,15 +69959,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/anthropic_schema.dag", 8759, 8766),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2660),
+            id: DeclarationId(2680),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -69053,10 +69978,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2661),
+            id: DeclarationId(2681),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69067,20 +69992,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/anthropic_schema.dag", 8897, 8904),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2662),
+            id: DeclarationId(2682),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2660),
+                        ty: DeclarationId(2680),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2661),
+                        ty: DeclarationId(2681),
                     },
                 ],
             },
@@ -69092,15 +70017,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/anthropic_schema.dag", 8897, 8904),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2663),
+            id: DeclarationId(2683),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -69111,10 +70036,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2664),
+            id: DeclarationId(2684),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69125,20 +70050,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/anthropic_schema.dag", 8990, 8997),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2665),
+            id: DeclarationId(2685),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2663),
+                        ty: DeclarationId(2683),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2664),
+                        ty: DeclarationId(2684),
                     },
                 ],
             },
@@ -69150,15 +70075,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/anthropic_schema.dag", 8990, 8997),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2666),
+            id: DeclarationId(2686),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1760),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -69169,10 +70094,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2667),
+            id: DeclarationId(2687),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69183,20 +70108,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/anthropic_schema.dag", 9695, 9730),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2668),
+            id: DeclarationId(2688),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2666),
+                        ty: DeclarationId(2686),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2667),
+                        ty: DeclarationId(2687),
                     },
                 ],
             },
@@ -69208,15 +70133,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/anthropic_schema.dag", 9695, 9730),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2669),
+            id: DeclarationId(2689),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(130),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -69227,10 +70152,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2670),
+            id: DeclarationId(2690),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69241,20 +70166,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/anthropic_schema.dag", 9933, 9938),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2671),
+            id: DeclarationId(2691),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2669),
+                        ty: DeclarationId(2689),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2670),
+                        ty: DeclarationId(2690),
                     },
                 ],
             },
@@ -69266,10 +70191,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2672),
+            id: DeclarationId(2692),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69285,10 +70210,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2673),
+            id: DeclarationId(2693),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69299,20 +70224,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/anthropic_schema.dag", 10038, 10043),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2674),
+            id: DeclarationId(2694),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2672),
+                        ty: DeclarationId(2692),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2673),
+                        ty: DeclarationId(2693),
                     },
                 ],
             },
@@ -69324,15 +70249,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/anthropic_schema.dag", 10038, 10043),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2675),
+            id: DeclarationId(2695),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(130),
+                    ty: DeclarationId(115),
                 }],
             },
             type_params: vec![],
@@ -69343,10 +70268,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2676),
+            id: DeclarationId(2696),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69357,20 +70282,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/anthropic_schema.dag", 10129, 10134),
+            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2677),
+            id: DeclarationId(2697),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2675),
+                        ty: DeclarationId(2695),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2676),
+                        ty: DeclarationId(2696),
                     },
                 ],
             },
@@ -69382,15 +70307,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/anthropic_schema.dag", 10129, 10134),
+            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2678),
+            id: DeclarationId(2698),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(93),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -69401,10 +70326,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2679),
+            id: DeclarationId(2699),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69415,20 +70340,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/anthropic_schema.dag", 10756, 10760),
+            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2680),
+            id: DeclarationId(2700),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2678),
+                        ty: DeclarationId(2698),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2679),
+                        ty: DeclarationId(2699),
                     },
                 ],
             },
@@ -69440,15 +70365,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/anthropic_schema.dag", 10756, 10760),
+            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2681),
+            id: DeclarationId(2701),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(93),
+                    ty: DeclarationId(898),
                 }],
             },
             type_params: vec![],
@@ -69459,10 +70384,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2682),
+            id: DeclarationId(2702),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69473,20 +70398,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/anthropic_schema.dag", 10792, 10796),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2683),
+            id: DeclarationId(2703),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2681),
+                        ty: DeclarationId(2701),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2682),
+                        ty: DeclarationId(2702),
                     },
                 ],
             },
@@ -69498,15 +70423,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/anthropic_schema.dag", 10792, 10796),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2684),
+            id: DeclarationId(2704),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(899),
                 }],
             },
             type_params: vec![],
@@ -69517,10 +70442,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2685),
+            id: DeclarationId(2705),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69531,20 +70456,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/anthropic_schema.dag", 10828, 10835),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2686),
+            id: DeclarationId(2706),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2684),
+                        ty: DeclarationId(2704),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2685),
+                        ty: DeclarationId(2705),
                     },
                 ],
             },
@@ -69556,15 +70481,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/anthropic_schema.dag", 10828, 10835),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2687),
+            id: DeclarationId(2707),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -69575,10 +70500,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2688),
+            id: DeclarationId(2708),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69589,20 +70514,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/anthropic_schema.dag", 11804, 11811),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2689),
+            id: DeclarationId(2709),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2687),
+                        ty: DeclarationId(2707),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2688),
+                        ty: DeclarationId(2708),
                     },
                 ],
             },
@@ -69614,15 +70539,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/anthropic_schema.dag", 11804, 11811),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2690),
+            id: DeclarationId(2710),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(130),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -69633,10 +70558,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             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/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2691),
+            id: DeclarationId(2711),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69647,20 +70572,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/anthropic_schema.dag", 11872, 11877),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2692),
+            id: DeclarationId(2712),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2690),
+                        ty: DeclarationId(2710),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2691),
+                        ty: DeclarationId(2711),
                     },
                 ],
             },
@@ -69672,15 +70597,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/anthropic_schema.dag", 11872, 11877),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2693),
+            id: DeclarationId(2713),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(935),
+                    ty: DeclarationId(956),
                 }],
             },
             type_params: vec![],
@@ -69694,7 +70619,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(2694),
+            id: DeclarationId(2714),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69708,17 +70633,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(2695),
+            id: DeclarationId(2715),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2693),
+                        ty: DeclarationId(2713),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2694),
+                        ty: DeclarationId(2714),
                     },
                 ],
             },
@@ -69733,7 +70658,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(2696),
+            id: DeclarationId(2716),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69752,7 +70677,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(2697),
+            id: DeclarationId(2717),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69766,17 +70691,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(2698),
+            id: DeclarationId(2718),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2696),
+                        ty: DeclarationId(2716),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2697),
+                        ty: DeclarationId(2717),
                     },
                 ],
             },
@@ -69791,7 +70716,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(2699),
+            id: DeclarationId(2719),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69810,7 +70735,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(2700),
+            id: DeclarationId(2720),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69824,17 +70749,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(2701),
+            id: DeclarationId(2721),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2699),
+                        ty: DeclarationId(2719),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2700),
+                        ty: DeclarationId(2720),
                     },
                 ],
             },
@@ -69849,7 +70774,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(2702),
+            id: DeclarationId(2722),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69868,7 +70793,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(2703),
+            id: DeclarationId(2723),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69882,17 +70807,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(2704),
+            id: DeclarationId(2724),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2702),
+                        ty: DeclarationId(2722),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2703),
+                        ty: DeclarationId(2723),
                     },
                 ],
             },
@@ -69907,12 +70832,12 @@ 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(2705),
+            id: DeclarationId(2725),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(946),
+                    ty: DeclarationId(967),
                 }],
             },
             type_params: vec![],
@@ -69926,7 +70851,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(2706),
+            id: DeclarationId(2726),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69940,17 +70865,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(2707),
+            id: DeclarationId(2727),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2705),
+                        ty: DeclarationId(2725),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2706),
+                        ty: DeclarationId(2726),
                     },
                 ],
             },
@@ -69965,12 +70890,12 @@ 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(2708),
+            id: DeclarationId(2728),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(946),
+                    ty: DeclarationId(967),
                 }],
             },
             type_params: vec![],
@@ -69984,7 +70909,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(2709),
+            id: DeclarationId(2729),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69998,17 +70923,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(2710),
+            id: DeclarationId(2730),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2708),
+                        ty: DeclarationId(2728),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2709),
+                        ty: DeclarationId(2729),
                     },
                 ],
             },
@@ -70023,12 +70948,12 @@ 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(2711),
+            id: DeclarationId(2731),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(938),
+                    ty: DeclarationId(959),
                 }],
             },
             type_params: vec![],
@@ -70042,7 +70967,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(2712),
+            id: DeclarationId(2732),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70056,17 +70981,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(2713),
+            id: DeclarationId(2733),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2711),
+                        ty: DeclarationId(2731),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2712),
+                        ty: DeclarationId(2732),
                     },
                 ],
             },
@@ -70081,12 +71006,12 @@ 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(2714),
+            id: DeclarationId(2734),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(935),
+                    ty: DeclarationId(1124),
                 }],
             },
             type_params: vec![],
@@ -70097,10 +71022,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2715),
+            id: DeclarationId(2735),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70111,20 +71036,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/induction.dag", 20558, 20570),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2716),
+            id: DeclarationId(2736),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2714),
+                        ty: DeclarationId(2734),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2715),
+                        ty: DeclarationId(2735),
                     },
                 ],
             },
@@ -70136,15 +71061,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/induction.dag", 20558, 20570),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2717),
+            id: DeclarationId(2737),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(940),
+                    ty: DeclarationId(1124),
                 }],
             },
             type_params: vec![],
@@ -70155,10 +71080,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2718),
+            id: DeclarationId(2738),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70169,20 +71094,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/induction.dag", 21943, 21958),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2719),
+            id: DeclarationId(2739),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2717),
+                        ty: DeclarationId(2737),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2718),
+                        ty: DeclarationId(2738),
                     },
                 ],
             },
@@ -70194,15 +71119,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/induction.dag", 21943, 21958),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2720),
+            id: DeclarationId(2740),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(93),
+                    ty: DeclarationId(1124),
                 }],
             },
             type_params: vec![],
@@ -70213,10 +71138,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2721),
+            id: DeclarationId(2741),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70227,20 +71152,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/induction.dag", 33612, 33616),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2722),
+            id: DeclarationId(2742),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2720),
+                        ty: DeclarationId(2740),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2721),
+                        ty: DeclarationId(2741),
                     },
                 ],
             },
@@ -70252,15 +71177,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/induction.dag", 33612, 33616),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2723),
+            id: DeclarationId(2743),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(93),
+                    ty: DeclarationId(1132),
                 }],
             },
             type_params: vec![],
@@ -70271,10 +71196,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
+            span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2724),
+            id: DeclarationId(2744),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70285,20 +71210,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/induction.dag", 33908, 33912),
+            span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2725),
+            id: DeclarationId(2745),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2723),
+                        ty: DeclarationId(2743),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2724),
+                        ty: DeclarationId(2744),
                     },
                 ],
             },
@@ -70310,15 +71235,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/induction.dag", 33908, 33912),
+            span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2726),
+            id: DeclarationId(2746),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(93),
+                    ty: DeclarationId(1134),
                 }],
             },
             type_params: vec![],
@@ -70329,10 +71254,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
+            span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2727),
+            id: DeclarationId(2747),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70343,20 +71268,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/induction.dag", 35157, 35161),
+            span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2728),
+            id: DeclarationId(2748),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2726),
+                        ty: DeclarationId(2746),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2727),
+                        ty: DeclarationId(2747),
                     },
                 ],
             },
@@ -70368,15 +71293,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/induction.dag", 35157, 35161),
+            span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2729),
+            id: DeclarationId(2749),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(93),
+                    ty: DeclarationId(956),
                 }],
             },
             type_params: vec![],
@@ -70387,10 +71312,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
+            span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2730),
+            id: DeclarationId(2750),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70401,20 +71326,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/induction.dag", 35632, 35636),
+            span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2731),
+            id: DeclarationId(2751),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2729),
+                        ty: DeclarationId(2749),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2730),
+                        ty: DeclarationId(2750),
                     },
                 ],
             },
@@ -70426,15 +71351,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/induction.dag", 35632, 35636),
+            span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2732),
+            id: DeclarationId(2752),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(93),
+                    ty: DeclarationId(961),
                 }],
             },
             type_params: vec![],
@@ -70445,10 +71370,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
+            span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2733),
+            id: DeclarationId(2753),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70459,20 +71384,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/induction.dag", 36895, 36899),
+            span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2734),
+            id: DeclarationId(2754),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2732),
+                        ty: DeclarationId(2752),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2733),
+                        ty: DeclarationId(2753),
                     },
                 ],
             },
@@ -70484,10 +71409,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
+            span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2735),
+            id: DeclarationId(2755),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70503,10 +71428,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
+            span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2736),
+            id: DeclarationId(2756),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70517,20 +71442,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/induction.dag", 37167, 37171),
+            span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2737),
+            id: DeclarationId(2757),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2735),
+                        ty: DeclarationId(2755),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2736),
+                        ty: DeclarationId(2756),
                     },
                 ],
             },
@@ -70542,15 +71467,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/induction.dag", 37167, 37171),
+            span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2738),
+            id: DeclarationId(2758),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1197),
+                    ty: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -70561,10 +71486,10 @@ 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", 2429, 2445),
+            span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2739),
+            id: DeclarationId(2759),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70575,20 +71500,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/termination.dag", 2429, 2445),
+            span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2740),
+            id: DeclarationId(2760),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2738),
+                        ty: DeclarationId(2758),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2739),
+                        ty: DeclarationId(2759),
                     },
                 ],
             },
@@ -70600,15 +71525,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/termination.dag", 2429, 2445),
+            span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2741),
+            id: DeclarationId(2761),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1197),
+                    ty: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -70619,10 +71544,10 @@ 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", 2450, 2466),
+            span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2742),
+            id: DeclarationId(2762),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70633,20 +71558,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/termination.dag", 2450, 2466),
+            span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2743),
+            id: DeclarationId(2763),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2741),
+                        ty: DeclarationId(2761),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2742),
+                        ty: DeclarationId(2762),
                     },
                 ],
             },
@@ -70658,15 +71583,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/termination.dag", 2450, 2466),
+            span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2744),
+            id: DeclarationId(2764),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1197),
+                    ty: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -70677,10 +71602,10 @@ 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", 2471, 2487),
+            span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2745),
+            id: DeclarationId(2765),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70691,20 +71616,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/termination.dag", 2471, 2487),
+            span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2746),
+            id: DeclarationId(2766),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2744),
+                        ty: DeclarationId(2764),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2745),
+                        ty: DeclarationId(2765),
                     },
                 ],
             },
@@ -70716,15 +71641,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/termination.dag", 2471, 2487),
+            span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2747),
+            id: DeclarationId(2767),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1205),
+                    ty: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -70735,10 +71660,10 @@ 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", 6397, 6419),
+            span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2748),
+            id: DeclarationId(2768),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70749,20 +71674,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/termination.dag", 6397, 6419),
+            span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2749),
+            id: DeclarationId(2769),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2747),
+                        ty: DeclarationId(2767),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2748),
+                        ty: DeclarationId(2768),
                     },
                 ],
             },
@@ -70774,15 +71699,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/termination.dag", 6397, 6419),
+            span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2750),
+            id: DeclarationId(2770),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1207),
+                    ty: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -70793,10 +71718,10 @@ 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", 6839, 6859),
+            span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2751),
+            id: DeclarationId(2771),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70807,20 +71732,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/termination.dag", 6839, 6859),
+            span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2752),
+            id: DeclarationId(2772),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2750),
+                        ty: DeclarationId(2770),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2751),
+                        ty: DeclarationId(2771),
                     },
                 ],
             },
@@ -70832,10 +71757,10 @@ 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", 6839, 6859),
+            span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2753),
+            id: DeclarationId(2773),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70854,7 +71779,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(2754),
+            id: DeclarationId(2774),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70868,17 +71793,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(2755),
+            id: DeclarationId(2775),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2753),
+                        ty: DeclarationId(2773),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2754),
+                        ty: DeclarationId(2774),
                     },
                 ],
             },
@@ -70893,7 +71818,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(2756),
+            id: DeclarationId(2776),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70912,7 +71837,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(2757),
+            id: DeclarationId(2777),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70926,17 +71851,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(2758),
+            id: DeclarationId(2778),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2756),
+                        ty: DeclarationId(2776),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2757),
+                        ty: DeclarationId(2777),
                     },
                 ],
             },
@@ -70951,7 +71876,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(2759),
+            id: DeclarationId(2779),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70970,7 +71895,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(2760),
+            id: DeclarationId(2780),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70984,17 +71909,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(2761),
+            id: DeclarationId(2781),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2759),
+                        ty: DeclarationId(2779),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2760),
+                        ty: DeclarationId(2780),
                     },
                 ],
             },
@@ -71009,12 +71934,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(2762),
+            id: DeclarationId(2782),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1372),
+                    ty: DeclarationId(1386),
                 }],
             },
             type_params: vec![],
@@ -71028,7 +71953,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(2763),
+            id: DeclarationId(2783),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71042,17 +71967,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(2764),
+            id: DeclarationId(2784),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2762),
+                        ty: DeclarationId(2782),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2763),
+                        ty: DeclarationId(2783),
                     },
                 ],
             },
@@ -71067,12 +71992,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(2765),
+            id: DeclarationId(2785),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2353),
+                    ty: DeclarationId(2373),
                 }],
             },
             type_params: vec![],
@@ -71086,7 +72011,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(2766),
+            id: DeclarationId(2786),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71100,17 +72025,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(2767),
+            id: DeclarationId(2787),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2765),
+                        ty: DeclarationId(2785),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2766),
+                        ty: DeclarationId(2786),
                     },
                 ],
             },
@@ -71125,12 +72050,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(2768),
+            id: DeclarationId(2788),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1361),
+                    ty: DeclarationId(1375),
                 }],
             },
             type_params: vec![],
@@ -71144,7 +72069,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(2769),
+            id: DeclarationId(2789),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71158,17 +72083,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(2770),
+            id: DeclarationId(2790),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2768),
+                        ty: DeclarationId(2788),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2769),
+                        ty: DeclarationId(2789),
                     },
                 ],
             },
@@ -71183,7 +72108,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(2771),
+            id: DeclarationId(2791),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71202,7 +72127,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(2772),
+            id: DeclarationId(2792),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71216,17 +72141,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(2773),
+            id: DeclarationId(2793),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2771),
+                        ty: DeclarationId(2791),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2772),
+                        ty: DeclarationId(2792),
                     },
                 ],
             },
@@ -71241,7 +72166,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(2774),
+            id: DeclarationId(2794),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71260,7 +72185,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(2795),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71274,17 +72199,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(2776),
+            id: DeclarationId(2796),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2774),
+                        ty: DeclarationId(2794),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2775),
+                        ty: DeclarationId(2795),
                     },
                 ],
             },
@@ -71299,7 +72224,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(2777),
+            id: DeclarationId(2797),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71318,7 +72243,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(2778),
+            id: DeclarationId(2798),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71332,17 +72257,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(2779),
+            id: DeclarationId(2799),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2777),
+                        ty: DeclarationId(2797),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2778),
+                        ty: DeclarationId(2798),
                     },
                 ],
             },
@@ -71357,12 +72282,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(2780),
+            id: DeclarationId(2800),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2387),
+                    ty: DeclarationId(2407),
                 }],
             },
             type_params: vec![],
@@ -71376,7 +72301,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(2781),
+            id: DeclarationId(2801),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71390,17 +72315,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(2782),
+            id: DeclarationId(2802),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2780),
+                        ty: DeclarationId(2800),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2781),
+                        ty: DeclarationId(2801),
                     },
                 ],
             },
@@ -71415,12 +72340,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(2783),
+            id: DeclarationId(2803),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2389),
+                    ty: DeclarationId(2409),
                 }],
             },
             type_params: vec![],
@@ -71434,7 +72359,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(2784),
+            id: DeclarationId(2804),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71448,17 +72373,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(2785),
+            id: DeclarationId(2805),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2783),
+                        ty: DeclarationId(2803),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2784),
+                        ty: DeclarationId(2804),
                     },
                 ],
             },
@@ -71473,7 +72398,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(2786),
+            id: DeclarationId(2806),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71492,7 +72417,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(2787),
+            id: DeclarationId(2807),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71506,17 +72431,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(2788),
+            id: DeclarationId(2808),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2786),
+                        ty: DeclarationId(2806),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2787),
+                        ty: DeclarationId(2807),
                     },
                 ],
             },
@@ -71531,12 +72456,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(2789),
+            id: DeclarationId(2809),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1391),
+                    ty: DeclarationId(1405),
                 }],
             },
             type_params: vec![],
@@ -71550,7 +72475,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(2790),
+            id: DeclarationId(2810),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71564,17 +72489,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(2791),
+            id: DeclarationId(2811),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2789),
+                        ty: DeclarationId(2809),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2790),
+                        ty: DeclarationId(2810),
                     },
                 ],
             },
@@ -71589,7 +72514,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(2792),
+            id: DeclarationId(2812),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71608,7 +72533,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(2793),
+            id: DeclarationId(2813),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71622,17 +72547,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(2794),
+            id: DeclarationId(2814),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2792),
+                        ty: DeclarationId(2812),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2793),
+                        ty: DeclarationId(2813),
                     },
                 ],
             },
@@ -71647,12 +72572,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(2795),
+            id: DeclarationId(2815),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1372),
+                    ty: DeclarationId(1386),
                 }],
             },
             type_params: vec![],
@@ -71666,7 +72591,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(2796),
+            id: DeclarationId(2816),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71680,17 +72605,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(2797),
+            id: DeclarationId(2817),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2795),
+                        ty: DeclarationId(2815),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2796),
+                        ty: DeclarationId(2816),
                     },
                 ],
             },
@@ -71705,12 +72630,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(2798),
+            id: DeclarationId(2818),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1371),
+                    ty: DeclarationId(1385),
                 }],
             },
             type_params: vec![],
@@ -71724,7 +72649,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(2799),
+            id: DeclarationId(2819),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71738,17 +72663,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(2800),
+            id: DeclarationId(2820),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2798),
+                        ty: DeclarationId(2818),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2799),
+                        ty: DeclarationId(2819),
                     },
                 ],
             },
@@ -71763,12 +72688,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(2801),
+            id: DeclarationId(2821),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1370),
+                    ty: DeclarationId(1384),
                 }],
             },
             type_params: vec![],
@@ -71782,7 +72707,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(2802),
+            id: DeclarationId(2822),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71796,17 +72721,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(2803),
+            id: DeclarationId(2823),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2801),
+                        ty: DeclarationId(2821),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2802),
+                        ty: DeclarationId(2822),
                     },
                 ],
             },
@@ -71821,7 +72746,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(2804),
+            id: DeclarationId(2824),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71840,7 +72765,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(2805),
+            id: DeclarationId(2825),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71854,17 +72779,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(2806),
+            id: DeclarationId(2826),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2804),
+                        ty: DeclarationId(2824),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2805),
+                        ty: DeclarationId(2825),
                     },
                 ],
             },
@@ -71879,7 +72804,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(2807),
+            id: DeclarationId(2827),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71898,7 +72823,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(2808),
+            id: DeclarationId(2828),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71912,17 +72837,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(2809),
+            id: DeclarationId(2829),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2807),
+                        ty: DeclarationId(2827),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2808),
+                        ty: DeclarationId(2828),
                     },
                 ],
             },
@@ -71937,7 +72862,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(2810),
+            id: DeclarationId(2830),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71956,7 +72881,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(2811),
+            id: DeclarationId(2831),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71970,17 +72895,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(2812),
+            id: DeclarationId(2832),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2810),
+                        ty: DeclarationId(2830),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2811),
+                        ty: DeclarationId(2831),
                     },
                 ],
             },
@@ -71995,12 +72920,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(2813),
+            id: DeclarationId(2833),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2417),
+                    ty: DeclarationId(2437),
                 }],
             },
             type_params: vec![],
@@ -72014,7 +72939,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(2814),
+            id: DeclarationId(2834),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72028,17 +72953,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(2815),
+            id: DeclarationId(2835),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2813),
+                        ty: DeclarationId(2833),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2814),
+                        ty: DeclarationId(2834),
                     },
                 ],
             },
@@ -72053,7 +72978,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(2816),
+            id: DeclarationId(2836),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72072,7 +72997,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(2837),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72086,17 +73011,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(2818),
+            id: DeclarationId(2838),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2816),
+                        ty: DeclarationId(2836),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2817),
+                        ty: DeclarationId(2837),
                     },
                 ],
             },
@@ -72111,7 +73036,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(2819),
+            id: DeclarationId(2839),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72130,7 +73055,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(2820),
+            id: DeclarationId(2840),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72144,17 +73069,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(2821),
+            id: DeclarationId(2841),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2819),
+                        ty: DeclarationId(2839),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2820),
+                        ty: DeclarationId(2840),
                     },
                 ],
             },
@@ -72169,7 +73094,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(2822),
+            id: DeclarationId(2842),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72188,7 +73113,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(2823),
+            id: DeclarationId(2843),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72202,17 +73127,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(2824),
+            id: DeclarationId(2844),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2822),
+                        ty: DeclarationId(2842),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2823),
+                        ty: DeclarationId(2843),
                     },
                 ],
             },
@@ -72227,7 +73152,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(2825),
+            id: DeclarationId(2845),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72246,7 +73171,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(2826),
+            id: DeclarationId(2846),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72260,17 +73185,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(2827),
+            id: DeclarationId(2847),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2825),
+                        ty: DeclarationId(2845),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2826),
+                        ty: DeclarationId(2846),
                     },
                 ],
             },
@@ -72285,7 +73210,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(2828),
+            id: DeclarationId(2848),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72304,7 +73229,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(2829),
+            id: DeclarationId(2849),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72318,17 +73243,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(2830),
+            id: DeclarationId(2850),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2828),
+                        ty: DeclarationId(2848),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2829),
+                        ty: DeclarationId(2849),
                     },
                 ],
             },
@@ -72343,12 +73268,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(2831),
+            id: DeclarationId(2851),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2425),
+                    ty: DeclarationId(2445),
                 }],
             },
             type_params: vec![],
@@ -72362,7 +73287,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(2832),
+            id: DeclarationId(2852),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72376,17 +73301,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(2833),
+            id: DeclarationId(2853),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2831),
+                        ty: DeclarationId(2851),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2832),
+                        ty: DeclarationId(2852),
                     },
                 ],
             },
@@ -72401,12 +73326,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(2834),
+            id: DeclarationId(2854),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2427),
+                    ty: DeclarationId(2447),
                 }],
             },
             type_params: vec![],
@@ -72420,7 +73345,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(2835),
+            id: DeclarationId(2855),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72434,17 +73359,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(2836),
+            id: DeclarationId(2856),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2834),
+                        ty: DeclarationId(2854),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2835),
+                        ty: DeclarationId(2855),
                     },
                 ],
             },
@@ -72459,7 +73384,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(2837),
+            id: DeclarationId(2857),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72478,7 +73403,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(2838),
+            id: DeclarationId(2858),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72492,17 +73417,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(2839),
+            id: DeclarationId(2859),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2837),
+                        ty: DeclarationId(2857),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2838),
+                        ty: DeclarationId(2858),
                     },
                 ],
             },
@@ -72517,7 +73442,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(2840),
+            id: DeclarationId(2860),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72536,7 +73461,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(2841),
+            id: DeclarationId(2861),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72550,17 +73475,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(2842),
+            id: DeclarationId(2862),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2840),
+                        ty: DeclarationId(2860),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2841),
+                        ty: DeclarationId(2861),
                     },
                 ],
             },
@@ -72575,7 +73500,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(2843),
+            id: DeclarationId(2863),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72594,7 +73519,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(2844),
+            id: DeclarationId(2864),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72608,17 +73533,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(2845),
+            id: DeclarationId(2865),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2843),
+                        ty: DeclarationId(2863),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2844),
+                        ty: DeclarationId(2864),
                     },
                 ],
             },
@@ -72633,7 +73558,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(2846),
+            id: DeclarationId(2866),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72652,7 +73577,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(2847),
+            id: DeclarationId(2867),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72666,17 +73591,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(2848),
+            id: DeclarationId(2868),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2846),
+                        ty: DeclarationId(2866),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2847),
+                        ty: DeclarationId(2867),
                     },
                 ],
             },
@@ -72691,7 +73616,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(2849),
+            id: DeclarationId(2869),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72710,7 +73635,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(2850),
+            id: DeclarationId(2870),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72724,17 +73649,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(2851),
+            id: DeclarationId(2871),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2849),
+                        ty: DeclarationId(2869),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2850),
+                        ty: DeclarationId(2870),
                     },
                 ],
             },
@@ -72749,7 +73674,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(2852),
+            id: DeclarationId(2872),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72768,7 +73693,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(2853),
+            id: DeclarationId(2873),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72782,17 +73707,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(2854),
+            id: DeclarationId(2874),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2852),
+                        ty: DeclarationId(2872),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2853),
+                        ty: DeclarationId(2873),
                     },
                 ],
             },
@@ -72807,7 +73732,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(2855),
+            id: DeclarationId(2875),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72826,7 +73751,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(2856),
+            id: DeclarationId(2876),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72840,17 +73765,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(2857),
+            id: DeclarationId(2877),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2855),
+                        ty: DeclarationId(2875),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2856),
+                        ty: DeclarationId(2876),
                     },
                 ],
             },
@@ -72865,7 +73790,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(2858),
+            id: DeclarationId(2878),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72884,7 +73809,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(2859),
+            id: DeclarationId(2879),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72898,17 +73823,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(2860),
+            id: DeclarationId(2880),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2858),
+                        ty: DeclarationId(2878),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2859),
+                        ty: DeclarationId(2879),
                     },
                 ],
             },
@@ -72923,7 +73848,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(2861),
+            id: DeclarationId(2881),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72942,7 +73867,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(2862),
+            id: DeclarationId(2882),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72956,17 +73881,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(2863),
+            id: DeclarationId(2883),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2861),
+                        ty: DeclarationId(2881),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2862),
+                        ty: DeclarationId(2882),
                     },
                 ],
             },
@@ -72981,7 +73906,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(2864),
+            id: DeclarationId(2884),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -73000,7 +73925,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(2865),
+            id: DeclarationId(2885),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73014,17 +73939,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(2866),
+            id: DeclarationId(2886),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2864),
+                        ty: DeclarationId(2884),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2865),
+                        ty: DeclarationId(2885),
                     },
                 ],
             },
@@ -73039,7 +73964,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(2867),
+            id: DeclarationId(2887),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -73058,7 +73983,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(2888),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73072,17 +73997,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(2869),
+            id: DeclarationId(2889),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2867),
+                        ty: DeclarationId(2887),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2868),
+                        ty: DeclarationId(2888),
                     },
                 ],
             },
@@ -73097,7 +74022,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(2870),
+            id: DeclarationId(2890),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -73116,7 +74041,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(2871),
+            id: DeclarationId(2891),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73130,17 +74055,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(2872),
+            id: DeclarationId(2892),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2870),
+                        ty: DeclarationId(2890),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2871),
+                        ty: DeclarationId(2891),
                     },
                 ],
             },
@@ -73155,7 +74080,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(2873),
+            id: DeclarationId(2893),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -73174,7 +74099,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(2874),
+            id: DeclarationId(2894),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73188,17 +74113,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(2875),
+            id: DeclarationId(2895),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2873),
+                        ty: DeclarationId(2893),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2874),
+                        ty: DeclarationId(2894),
                     },
                 ],
             },
@@ -73213,7 +74138,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(2876),
+            id: DeclarationId(2896),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -73232,7 +74157,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(2877),
+            id: DeclarationId(2897),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73246,17 +74171,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(2878),
+            id: DeclarationId(2898),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2876),
+                        ty: DeclarationId(2896),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2877),
+                        ty: DeclarationId(2897),
                     },
                 ],
             },
@@ -74697,7 +75622,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(177),
             Port {
                 id: PortId(177),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(845))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(901))),
                 produced_by: None,
             },
         );
@@ -74705,7 +75630,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(178),
             Port {
                 id: PortId(178),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(845))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(901))),
                 produced_by: None,
             },
         );
@@ -74737,7 +75662,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(182),
             Port {
                 id: PortId(182),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -74753,7 +75678,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(184),
             Port {
                 id: PortId(184),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(850))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(906))),
                 produced_by: Some(NodeId(180)),
             },
         );
@@ -74761,7 +75686,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(185),
             Port {
                 id: PortId(185),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -74769,7 +75694,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(186),
             Port {
                 id: PortId(186),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -74793,7 +75718,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(189),
             Port {
                 id: PortId(189),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1628))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1754))),
                 produced_by: Some(NodeId(184)),
             },
         );
@@ -74801,7 +75726,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(190),
             Port {
                 id: PortId(190),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -74809,7 +75734,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(191),
             Port {
                 id: PortId(191),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -74817,7 +75742,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(192),
             Port {
                 id: PortId(192),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1629))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1755))),
                 produced_by: None,
             },
         );
@@ -74825,7 +75750,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(193),
             Port {
                 id: PortId(193),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1630))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1756))),
                 produced_by: Some(NodeId(186)),
             },
         );
@@ -74833,7 +75758,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(194),
             Port {
                 id: PortId(194),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -74881,7 +75806,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(200),
             Port {
                 id: PortId(200),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(848))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(904))),
                 produced_by: None,
             },
         );
@@ -74953,7 +75878,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(209),
             Port {
                 id: PortId(209),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -74961,7 +75886,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(210),
             Port {
                 id: PortId(210),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -74985,7 +75910,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(213),
             Port {
                 id: PortId(213),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(203)),
             },
         );
@@ -74993,7 +75918,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(214),
             Port {
                 id: PortId(214),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -75001,7 +75926,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(215),
             Port {
                 id: PortId(215),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -75025,7 +75950,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(218),
             Port {
                 id: PortId(218),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(207)),
             },
         );
@@ -75033,7 +75958,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(219),
             Port {
                 id: PortId(219),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -75041,7 +75966,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(220),
             Port {
                 id: PortId(220),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -75065,7 +75990,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(223),
             Port {
                 id: PortId(223),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(211)),
             },
         );
@@ -75073,7 +75998,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(224),
             Port {
                 id: PortId(224),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -75081,7 +76006,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(225),
             Port {
                 id: PortId(225),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -75105,7 +76030,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(228),
             Port {
                 id: PortId(228),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(215)),
             },
         );
@@ -75113,7 +76038,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(229),
             Port {
                 id: PortId(229),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1631))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1757))),
                 produced_by: None,
             },
         );
@@ -75137,7 +76062,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(232),
             Port {
                 id: PortId(232),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(219)),
             },
         );
@@ -75145,7 +76070,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(233),
             Port {
                 id: PortId(233),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -75153,7 +76078,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(234),
             Port {
                 id: PortId(234),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -75857,7 +76782,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(322),
             Port {
                 id: PortId(322),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(845))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(901))),
                 produced_by: None,
             },
         );
@@ -75865,7 +76790,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(323),
             Port {
                 id: PortId(323),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(845))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(901))),
                 produced_by: None,
             },
         );
@@ -75881,7 +76806,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(325),
             Port {
                 id: PortId(325),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(865))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(921))),
                 produced_by: None,
             },
         );
@@ -75889,7 +76814,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(326),
             Port {
                 id: PortId(326),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(865))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(921))),
                 produced_by: None,
             },
         );
@@ -76513,7 +77438,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(404),
             Port {
                 id: PortId(404),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(865))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(921))),
                 produced_by: None,
             },
         );
@@ -76521,7 +77446,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(405),
             Port {
                 id: PortId(405),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(865))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(921))),
                 produced_by: None,
             },
         );
@@ -76537,7 +77462,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(407),
             Port {
                 id: PortId(407),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(865))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(921))),
                 produced_by: Some(NodeId(347)),
             },
         );
@@ -76545,7 +77470,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(408),
             Port {
                 id: PortId(408),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(865))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(921))),
                 produced_by: None,
             },
         );
@@ -76553,7 +77478,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(409),
             Port {
                 id: PortId(409),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(865))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(921))),
                 produced_by: None,
             },
         );
@@ -76569,7 +77494,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(411),
             Port {
                 id: PortId(411),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(865))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(921))),
                 produced_by: Some(NodeId(350)),
             },
         );
@@ -76577,7 +77502,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(412),
             Port {
                 id: PortId(412),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -76657,7 +77582,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(422),
             Port {
                 id: PortId(422),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(359)),
             },
         );
@@ -76665,7 +77590,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(423),
             Port {
                 id: PortId(423),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1632))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1758))),
                 produced_by: None,
             },
         );
@@ -76673,7 +77598,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(424),
             Port {
                 id: PortId(424),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(361)),
             },
         );
@@ -76681,7 +77606,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(425),
             Port {
                 id: PortId(425),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(362)),
             },
         );
@@ -76689,7 +77614,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(426),
             Port {
                 id: PortId(426),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1629))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1755))),
                 produced_by: Some(NodeId(363)),
             },
         );
@@ -76705,7 +77630,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(428),
             Port {
                 id: PortId(428),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1633))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1759))),
                 produced_by: Some(NodeId(365)),
             },
         );
@@ -76713,7 +77638,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(429),
             Port {
                 id: PortId(429),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1634))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1760))),
                 produced_by: None,
             },
         );
@@ -76817,7 +77742,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(442),
             Port {
                 id: PortId(442),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1635))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1761))),
                 produced_by: Some(NodeId(378)),
             },
         );
@@ -76825,7 +77750,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(443),
             Port {
                 id: PortId(443),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1636))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1762))),
                 produced_by: None,
             },
         );
@@ -76873,7 +77798,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(449),
             Port {
                 id: PortId(449),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1637))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1763))),
                 produced_by: Some(NodeId(385)),
             },
         );
@@ -76881,7 +77806,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(450),
             Port {
                 id: PortId(450),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1638))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1764))),
                 produced_by: None,
             },
         );
@@ -76961,7 +77886,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(460),
             Port {
                 id: PortId(460),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1639))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1765))),
                 produced_by: None,
             },
         );
@@ -77065,7 +77990,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(473),
             Port {
                 id: PortId(473),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1640))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1766))),
                 produced_by: Some(NodeId(407)),
             },
         );
@@ -77073,7 +77998,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(474),
             Port {
                 id: PortId(474),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -77209,7 +78134,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(491),
             Port {
                 id: PortId(491),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -77345,7 +78270,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(508),
             Port {
                 id: PortId(508),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1641))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1767))),
                 produced_by: None,
             },
         );
@@ -77449,7 +78374,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(521),
             Port {
                 id: PortId(521),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(439)),
             },
         );
@@ -77457,7 +78382,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(522),
             Port {
                 id: PortId(522),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1642))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1768))),
                 produced_by: None,
             },
         );
@@ -77561,7 +78486,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(535),
             Port {
                 id: PortId(535),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(451)),
             },
         );
@@ -77569,7 +78494,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(536),
             Port {
                 id: PortId(536),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1643))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1769))),
                 produced_by: None,
             },
         );
@@ -77721,7 +78646,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(555),
             Port {
                 id: PortId(555),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(468)),
             },
         );
@@ -77729,7 +78654,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(556),
             Port {
                 id: PortId(556),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -77737,7 +78662,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(557),
             Port {
                 id: PortId(557),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -77857,7 +78782,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(572),
             Port {
                 id: PortId(572),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(477)),
             },
         );
@@ -77865,7 +78790,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(573),
             Port {
                 id: PortId(573),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(845))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(901))),
                 produced_by: None,
             },
         );
@@ -77873,7 +78798,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(574),
             Port {
                 id: PortId(574),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -77881,7 +78806,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(575),
             Port {
                 id: PortId(575),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -78001,7 +78926,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(590),
             Port {
                 id: PortId(590),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(486)),
             },
         );
@@ -78009,7 +78934,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(591),
             Port {
                 id: PortId(591),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(845))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(901))),
                 produced_by: None,
             },
         );
@@ -78017,7 +78942,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(592),
             Port {
                 id: PortId(592),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(845))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(901))),
                 produced_by: None,
             },
         );
@@ -78025,7 +78950,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(593),
             Port {
                 id: PortId(593),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -78033,7 +78958,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(594),
             Port {
                 id: PortId(594),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -78065,7 +78990,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(598),
             Port {
                 id: PortId(598),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(491)),
             },
         );
@@ -78073,7 +78998,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(599),
             Port {
                 id: PortId(599),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -78081,7 +79006,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(600),
             Port {
                 id: PortId(600),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -78097,7 +79022,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(602),
             Port {
                 id: PortId(602),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(494)),
             },
         );
@@ -78105,7 +79030,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(603),
             Port {
                 id: PortId(603),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(850))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(906))),
                 produced_by: None,
             },
         );
@@ -78113,7 +79038,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(604),
             Port {
                 id: PortId(604),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -78129,7 +79054,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(606),
             Port {
                 id: PortId(606),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(497)),
             },
         );
@@ -78153,7 +79078,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(609),
             Port {
                 id: PortId(609),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(500)),
             },
         );
@@ -78161,7 +79086,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(610),
             Port {
                 id: PortId(610),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(850))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(906))),
                 produced_by: Some(NodeId(501)),
             },
         );
@@ -78169,7 +79094,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(611),
             Port {
                 id: PortId(611),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(850))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(906))),
                 produced_by: None,
             },
         );
@@ -78185,7 +79110,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(613),
             Port {
                 id: PortId(613),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1644))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1770))),
                 produced_by: None,
             },
         );
@@ -78193,7 +79118,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(614),
             Port {
                 id: PortId(614),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -78297,7 +79222,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(627),
             Port {
                 id: PortId(627),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1645))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1771))),
                 produced_by: Some(NodeId(516)),
             },
         );
@@ -78305,7 +79230,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(628),
             Port {
                 id: PortId(628),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1646))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1772))),
                 produced_by: None,
             },
         );
@@ -78313,7 +79238,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(629),
             Port {
                 id: PortId(629),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: None,
             },
         );
@@ -78361,7 +79286,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(635),
             Port {
                 id: PortId(635),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1647))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1773))),
                 produced_by: Some(NodeId(523)),
             },
         );
@@ -78369,7 +79294,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(636),
             Port {
                 id: PortId(636),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1648))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1774))),
                 produced_by: None,
             },
         );
@@ -78385,7 +79310,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(638),
             Port {
                 id: PortId(638),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1649))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1775))),
                 produced_by: Some(NodeId(526)),
             },
         );
@@ -78393,7 +79318,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(639),
             Port {
                 id: PortId(639),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1085))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1164))),
                 produced_by: None,
             },
         );
@@ -78553,7 +79478,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(659),
             Port {
                 id: PortId(659),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(543)),
             },
         );
@@ -78561,7 +79486,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(660),
             Port {
                 id: PortId(660),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1084))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1163))),
                 produced_by: None,
             },
         );
@@ -78641,7 +79566,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(670),
             Port {
                 id: PortId(670),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(552)),
             },
         );
@@ -78649,7 +79574,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(671),
             Port {
                 id: PortId(671),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1982))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2067))),
                 produced_by: None,
             },
         );
@@ -78657,7 +79582,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(672),
             Port {
                 id: PortId(672),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(849))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(905))),
                 produced_by: Some(NodeId(554)),
             },
         );
@@ -78673,55 +79598,55 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(674),
             Port {
                 id: PortId(674),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(827))),
-                produced_by: None,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2189))),
+                produced_by: Some(NodeId(556)),
             },
         );
         ports.insert(
             PortId(675),
             Port {
                 id: PortId(675),
-                state: PortState::Uninferred,
-                produced_by: None,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(158))),
+                produced_by: Some(NodeId(558)),
             },
         );
         ports.insert(
             PortId(676),
             Port {
                 id: PortId(676),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(556)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(721))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(677),
             Port {
                 id: PortId(677),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(557)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(173))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(678),
             Port {
                 id: PortId(678),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(558)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(174))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(679),
             Port {
                 id: PortId(679),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(559)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(177))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(680),
             Port {
                 id: PortId(680),
-                state: PortState::Uninferred,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1213))),
                 produced_by: None,
             },
         );
@@ -78729,7 +79654,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(681),
             Port {
                 id: PortId(681),
-                state: PortState::Uninferred,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1216))),
                 produced_by: Some(NodeId(560)),
             },
         );
@@ -78737,31 +79662,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(682),
             Port {
                 id: PortId(682),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(561)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1214))),
+                produced_by: Some(NodeId(562)),
             },
         );
         ports.insert(
             PortId(683),
             Port {
                 id: PortId(683),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(562)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1214))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(684),
             Port {
                 id: PortId(684),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(563)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1214))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(685),
             Port {
                 id: PortId(685),
-                state: PortState::Uninferred,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
                 produced_by: None,
             },
         );
@@ -78842,7 +79767,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(695),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(572)),
             },
         );
         ports.insert(
@@ -78850,7 +79775,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(696),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(572)),
+                produced_by: Some(NodeId(573)),
             },
         );
         ports.insert(
@@ -78858,7 +79783,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(697),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(573)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -78882,7 +79807,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(700),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(576)),
             },
         );
         ports.insert(
@@ -78890,7 +79815,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(701),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(576)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -78922,7 +79847,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(705),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(580)),
             },
         );
         ports.insert(
@@ -78930,7 +79855,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(706),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(580)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -78962,7 +79887,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(710),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(584)),
             },
         );
         ports.insert(
@@ -78970,7 +79895,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(711),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(584)),
+                produced_by: Some(NodeId(585)),
             },
         );
         ports.insert(
@@ -78978,7 +79903,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(712),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(585)),
+                produced_by: Some(NodeId(586)),
             },
         );
         ports.insert(
@@ -78986,7 +79911,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(713),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(586)),
+                produced_by: Some(NodeId(587)),
             },
         );
         ports.insert(
@@ -78994,7 +79919,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(714),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(587)),
+                produced_by: Some(NodeId(588)),
             },
         );
         ports.insert(
@@ -79002,7 +79927,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(715),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(589)),
             },
         );
         ports.insert(
@@ -79010,7 +79935,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(716),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(588)),
+                produced_by: Some(NodeId(590)),
             },
         );
         ports.insert(
@@ -79018,7 +79943,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(717),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(589)),
+                produced_by: Some(NodeId(591)),
             },
         );
         ports.insert(
@@ -79026,7 +79951,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(718),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(590)),
+                produced_by: Some(NodeId(592)),
             },
         );
         ports.insert(
@@ -79034,31 +79959,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(719),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(591)),
+                produced_by: Some(NodeId(593)),
             },
         );
         ports.insert(
             PortId(720),
             Port {
                 id: PortId(720),
-                state: PortState::Uninferred,
-                produced_by: None,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1214))),
+                produced_by: Some(NodeId(594)),
             },
         );
         ports.insert(
             PortId(721),
             Port {
                 id: PortId(721),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(592)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1214))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(722),
             Port {
                 id: PortId(722),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(593)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1214))),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -79066,78 +79991,78 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(723),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(594)),
+                produced_by: Some(NodeId(596)),
             },
         );
         ports.insert(
             PortId(724),
             Port {
                 id: PortId(724),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(595)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1214))),
+                produced_by: Some(NodeId(597)),
             },
         );
         ports.insert(
             PortId(725),
             Port {
                 id: PortId(725),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2054))),
-                produced_by: Some(NodeId(596)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(599)),
             },
         );
         ports.insert(
             PortId(726),
             Port {
                 id: PortId(726),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
-                produced_by: None,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1213))),
+                produced_by: Some(NodeId(600)),
             },
         );
         ports.insert(
             PortId(727),
             Port {
                 id: PortId(727),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(827))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(602)),
             },
         );
         ports.insert(
             PortId(728),
             Port {
                 id: PortId(728),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2055))),
-                produced_by: Some(NodeId(598)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1214))),
+                produced_by: Some(NodeId(603)),
             },
         );
         ports.insert(
             PortId(729),
             Port {
                 id: PortId(729),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2056))),
-                produced_by: Some(NodeId(600)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1214))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(730),
             Port {
                 id: PortId(730),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2057))),
-                produced_by: Some(NodeId(602)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1214))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(731),
             Port {
                 id: PortId(731),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2058))),
-                produced_by: Some(NodeId(604)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(605)),
             },
         );
         ports.insert(
             PortId(732),
             Port {
                 id: PortId(732),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2059))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1214))),
                 produced_by: Some(NodeId(606)),
             },
         );
@@ -79145,7 +80070,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(733),
             Port {
                 id: PortId(733),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2060))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2190))),
                 produced_by: Some(NodeId(608)),
             },
         );
@@ -79153,15 +80078,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(734),
             Port {
                 id: PortId(734),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2062))),
-                produced_by: Some(NodeId(610)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(827))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(735),
             Port {
                 id: PortId(735),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1222))),
+                state: PortState::Uninferred,
                 produced_by: None,
             },
         );
@@ -79170,7 +80095,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(736),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(612)),
+                produced_by: Some(NodeId(610)),
             },
         );
         ports.insert(
@@ -79178,22 +80103,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(737),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(613)),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(738),
             Port {
                 id: PortId(738),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2064))),
-                produced_by: Some(NodeId(614)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(611)),
             },
         );
         ports.insert(
             PortId(739),
             Port {
                 id: PortId(739),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(982))),
+                state: PortState::Uninferred,
                 produced_by: None,
             },
         );
@@ -79202,23 +80127,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(740),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(616)),
+                produced_by: Some(NodeId(612)),
             },
         );
         ports.insert(
             PortId(741),
             Port {
                 id: PortId(741),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2065))),
-                produced_by: Some(NodeId(617)),
+                state: PortState::Uninferred,
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(742),
             Port {
                 id: PortId(742),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1222))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(613)),
             },
         );
         ports.insert(
@@ -79226,7 +80151,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(743),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(619)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -79234,22 +80159,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(744),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(620)),
+                produced_by: Some(NodeId(614)),
             },
         );
         ports.insert(
             PortId(745),
             Port {
                 id: PortId(745),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2066))),
-                produced_by: Some(NodeId(621)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(159))),
+                produced_by: Some(NodeId(615)),
             },
         );
         ports.insert(
             PortId(746),
             Port {
                 id: PortId(746),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1222))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(230))),
                 produced_by: None,
             },
         );
@@ -79257,7 +80182,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(747),
             Port {
                 id: PortId(747),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(982))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(159))),
                 produced_by: None,
             },
         );
@@ -79266,7 +80191,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(748),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(623)),
+                produced_by: Some(NodeId(617)),
             },
         );
         ports.insert(
@@ -79274,7 +80199,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(749),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(624)),
+                produced_by: Some(NodeId(618)),
             },
         );
         ports.insert(
@@ -79282,31 +80207,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(750),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(625)),
+                produced_by: Some(NodeId(619)),
             },
         );
         ports.insert(
             PortId(751),
             Port {
                 id: PortId(751),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2067))),
-                produced_by: Some(NodeId(626)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1039))),
+                produced_by: Some(NodeId(620)),
             },
         );
         ports.insert(
             PortId(752),
             Port {
                 id: PortId(752),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(622)),
             },
         );
         ports.insert(
             PortId(753),
             Port {
                 id: PortId(753),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1222))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(623)),
             },
         );
         ports.insert(
@@ -79314,22 +80239,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(754),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(628)),
+                produced_by: Some(NodeId(624)),
             },
         );
         ports.insert(
             PortId(755),
             Port {
                 id: PortId(755),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(629)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(159))),
+                produced_by: Some(NodeId(625)),
             },
         );
         ports.insert(
             PortId(756),
             Port {
                 id: PortId(756),
-                state: PortState::Uninferred,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
                 produced_by: None,
             },
         );
@@ -79337,8 +80262,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(757),
             Port {
                 id: PortId(757),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(630)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(230))),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -79346,47 +80271,47 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(758),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(631)),
+                produced_by: Some(NodeId(627)),
             },
         );
         ports.insert(
             PortId(759),
             Port {
                 id: PortId(759),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(632)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1632))),
+                produced_by: Some(NodeId(628)),
             },
         );
         ports.insert(
             PortId(760),
             Port {
                 id: PortId(760),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2068))),
-                produced_by: Some(NodeId(633)),
+                state: PortState::Uninferred,
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(761),
             Port {
                 id: PortId(761),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(629)),
             },
         );
         ports.insert(
             PortId(762),
             Port {
                 id: PortId(762),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1222))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(630)),
             },
         );
         ports.insert(
             PortId(763),
             Port {
                 id: PortId(763),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(982))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(631)),
             },
         );
         ports.insert(
@@ -79394,7 +80319,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(764),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(635)),
+                produced_by: Some(NodeId(632)),
             },
         );
         ports.insert(
@@ -79402,7 +80327,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(765),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(636)),
+                produced_by: Some(NodeId(633)),
             },
         );
         ports.insert(
@@ -79410,7 +80335,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(766),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(634)),
             },
         );
         ports.insert(
@@ -79418,7 +80343,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(767),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(637)),
+                produced_by: Some(NodeId(635)),
             },
         );
         ports.insert(
@@ -79426,7 +80351,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(768),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(638)),
+                produced_by: Some(NodeId(636)),
             },
         );
         ports.insert(
@@ -79434,54 +80359,54 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(769),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(639)),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(770),
             Port {
                 id: PortId(770),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2069))),
-                produced_by: Some(NodeId(640)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(637)),
             },
         );
         ports.insert(
             PortId(771),
             Port {
                 id: PortId(771),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(638)),
             },
         );
         ports.insert(
             PortId(772),
             Port {
                 id: PortId(772),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1222))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(639)),
             },
         );
         ports.insert(
             PortId(773),
             Port {
                 id: PortId(773),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(986))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(640)),
             },
         );
         ports.insert(
             PortId(774),
             Port {
                 id: PortId(774),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(642)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1043))),
+                produced_by: Some(NodeId(641)),
             },
         );
         ports.insert(
             PortId(775),
             Port {
                 id: PortId(775),
-                state: PortState::Uninferred,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1214))),
                 produced_by: None,
             },
         );
@@ -79489,8 +80414,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(776),
             Port {
                 id: PortId(776),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(643)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(818))),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -79498,22 +80423,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(777),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(644)),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(778),
             Port {
                 id: PortId(778),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2070))),
-                produced_by: Some(NodeId(645)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(643)),
             },
         );
         ports.insert(
             PortId(779),
             Port {
                 id: PortId(779),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Uninferred,
                 produced_by: None,
             },
         );
@@ -79521,8 +80446,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(780),
             Port {
                 id: PortId(780),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2071))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(644)),
             },
         );
         ports.insert(
@@ -79538,7 +80463,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(782),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(647)),
+                produced_by: Some(NodeId(645)),
             },
         );
         ports.insert(
@@ -79546,7 +80471,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(783),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(648)),
+                produced_by: Some(NodeId(646)),
             },
         );
         ports.insert(
@@ -79554,7 +80479,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(784),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(647)),
             },
         );
         ports.insert(
@@ -79562,7 +80487,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(785),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(649)),
+                produced_by: Some(NodeId(648)),
             },
         );
         ports.insert(
@@ -79570,31 +80495,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(786),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(650)),
+                produced_by: Some(NodeId(649)),
             },
         );
         ports.insert(
             PortId(787),
             Port {
                 id: PortId(787),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(651)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1214))),
+                produced_by: Some(NodeId(650)),
             },
         );
         ports.insert(
             PortId(788),
             Port {
                 id: PortId(788),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(652)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(789),
             Port {
                 id: PortId(789),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(653)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(827))),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -79602,31 +80527,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(790),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(654)),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(791),
             Port {
                 id: PortId(791),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2072))),
-                produced_by: Some(NodeId(655)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(652)),
             },
         );
         ports.insert(
             PortId(792),
             Port {
                 id: PortId(792),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(653)),
             },
         );
         ports.insert(
             PortId(793),
             Port {
                 id: PortId(793),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(827))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(654)),
             },
         );
         ports.insert(
@@ -79634,7 +80559,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(794),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(657)),
+                produced_by: Some(NodeId(655)),
             },
         );
         ports.insert(
@@ -79642,7 +80567,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(795),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(658)),
+                produced_by: Some(NodeId(656)),
             },
         );
         ports.insert(
@@ -79650,7 +80575,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(796),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(659)),
+                produced_by: Some(NodeId(657)),
             },
         );
         ports.insert(
@@ -79658,7 +80583,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(797),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(660)),
+                produced_by: Some(NodeId(658)),
             },
         );
         ports.insert(
@@ -79666,7 +80591,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(798),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(661)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -79674,62 +80599,62 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(799),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(662)),
+                produced_by: Some(NodeId(659)),
             },
         );
         ports.insert(
             PortId(800),
             Port {
                 id: PortId(800),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2073))),
-                produced_by: Some(NodeId(663)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(660)),
             },
         );
         ports.insert(
             PortId(801),
             Port {
                 id: PortId(801),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(158))),
-                produced_by: Some(NodeId(665)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(661)),
             },
         );
         ports.insert(
             PortId(802),
             Port {
                 id: PortId(802),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(721))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(662)),
             },
         );
         ports.insert(
             PortId(803),
             Port {
                 id: PortId(803),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(173))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(663)),
             },
         );
         ports.insert(
             PortId(804),
             Port {
                 id: PortId(804),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(174))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(664)),
             },
         );
         ports.insert(
             PortId(805),
             Port {
                 id: PortId(805),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(177))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(665)),
             },
         );
         ports.insert(
             PortId(806),
             Port {
                 id: PortId(806),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1221))),
+                state: PortState::Uninferred,
                 produced_by: None,
             },
         );
@@ -79737,40 +80662,40 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(807),
             Port {
                 id: PortId(807),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1224))),
-                produced_by: Some(NodeId(667)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(666)),
             },
         );
         ports.insert(
             PortId(808),
             Port {
                 id: PortId(808),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1222))),
-                produced_by: Some(NodeId(669)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(667)),
             },
         );
         ports.insert(
             PortId(809),
             Port {
                 id: PortId(809),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1222))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(668)),
             },
         );
         ports.insert(
             PortId(810),
             Port {
                 id: PortId(810),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1222))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(669)),
             },
         );
         ports.insert(
             PortId(811),
             Port {
                 id: PortId(811),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(670)),
             },
         );
         ports.insert(
@@ -79794,7 +80719,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(814),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(673)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -79802,7 +80727,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(815),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(674)),
+                produced_by: Some(NodeId(673)),
             },
         );
         ports.insert(
@@ -79810,7 +80735,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(816),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(674)),
             },
         );
         ports.insert(
@@ -79858,7 +80783,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(822),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(680)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -79866,7 +80791,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(823),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(680)),
             },
         );
         ports.insert(
@@ -79898,7 +80823,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(827),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(684)),
             },
         );
         ports.insert(
@@ -79906,7 +80831,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(828),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(684)),
+                produced_by: Some(NodeId(685)),
             },
         );
         ports.insert(
@@ -79914,30 +80839,30 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(829),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(685)),
+                produced_by: Some(NodeId(686)),
             },
         );
         ports.insert(
             PortId(830),
             Port {
                 id: PortId(830),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(686)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2191))),
+                produced_by: Some(NodeId(687)),
             },
         );
         ports.insert(
             PortId(831),
             Port {
                 id: PortId(831),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(687)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(832),
             Port {
                 id: PortId(832),
-                state: PortState::Uninferred,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1214))),
                 produced_by: None,
             },
         );
@@ -79946,7 +80871,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(833),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(688)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -80049,7 +80974,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(846),
             Port {
                 id: PortId(846),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1222))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1043))),
                 produced_by: Some(NodeId(701)),
             },
         );
@@ -80057,15 +80982,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(847),
             Port {
                 id: PortId(847),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1222))),
-                produced_by: None,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(76))),
+                produced_by: Some(NodeId(703)),
             },
         );
         ports.insert(
             PortId(848),
             Port {
                 id: PortId(848),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1222))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1214))),
                 produced_by: None,
             },
         );
@@ -80074,15 +80999,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(849),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(703)),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(850),
             Port {
                 id: PortId(850),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1222))),
-                produced_by: Some(NodeId(704)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(705)),
             },
         );
         ports.insert(
@@ -80097,7 +81022,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(852),
             Port {
                 id: PortId(852),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1221))),
+                state: PortState::Uninferred,
                 produced_by: Some(NodeId(707)),
             },
         );
@@ -80106,30 +81031,30 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(853),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(709)),
+                produced_by: Some(NodeId(708)),
             },
         );
         ports.insert(
             PortId(854),
             Port {
                 id: PortId(854),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1222))),
-                produced_by: Some(NodeId(710)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(709)),
             },
         );
         ports.insert(
             PortId(855),
             Port {
                 id: PortId(855),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1222))),
-                produced_by: None,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1221))),
+                produced_by: Some(NodeId(710)),
             },
         );
         ports.insert(
             PortId(856),
             Port {
                 id: PortId(856),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1222))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1214))),
                 produced_by: None,
             },
         );
@@ -80137,48 +81062,48 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(857),
             Port {
                 id: PortId(857),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(712)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1220))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(858),
             Port {
                 id: PortId(858),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1222))),
-                produced_by: Some(NodeId(713)),
+                state: PortState::Uninferred,
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(859),
             Port {
                 id: PortId(859),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2130))),
-                produced_by: Some(NodeId(715)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(712)),
             },
         );
         ports.insert(
             PortId(860),
             Port {
                 id: PortId(860),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(827))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(713)),
             },
         );
         ports.insert(
             PortId(861),
             Port {
                 id: PortId(861),
-                state: PortState::Uninferred,
-                produced_by: None,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1213))),
+                produced_by: Some(NodeId(714)),
             },
         );
         ports.insert(
             PortId(862),
             Port {
                 id: PortId(862),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(717)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(76))),
+                produced_by: Some(NodeId(715)),
             },
         );
         ports.insert(
@@ -80186,7 +81111,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(863),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(716)),
             },
         );
         ports.insert(
@@ -80194,7 +81119,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(864),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(718)),
+                produced_by: Some(NodeId(717)),
             },
         );
         ports.insert(
@@ -80202,7 +81127,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(865),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(718)),
             },
         );
         ports.insert(
@@ -80218,7 +81143,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(867),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(720)),
             },
         );
         ports.insert(
@@ -80226,7 +81151,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(868),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(720)),
+                produced_by: Some(NodeId(721)),
             },
         );
         ports.insert(
@@ -80234,7 +81159,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(869),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(722)),
             },
         );
         ports.insert(
@@ -80242,31 +81167,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(870),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(721)),
+                produced_by: Some(NodeId(723)),
             },
         );
         ports.insert(
             PortId(871),
             Port {
                 id: PortId(871),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(159))),
-                produced_by: Some(NodeId(722)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(724)),
             },
         );
         ports.insert(
             PortId(872),
             Port {
                 id: PortId(872),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(230))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(725)),
             },
         );
         ports.insert(
             PortId(873),
             Port {
                 id: PortId(873),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(159))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(726)),
             },
         );
         ports.insert(
@@ -80274,7 +81199,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(874),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(724)),
+                produced_by: Some(NodeId(727)),
             },
         );
         ports.insert(
@@ -80282,7 +81207,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(875),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(725)),
+                produced_by: Some(NodeId(728)),
             },
         );
         ports.insert(
@@ -80290,15 +81215,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(876),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(726)),
+                produced_by: Some(NodeId(729)),
             },
         );
         ports.insert(
             PortId(877),
             Port {
                 id: PortId(877),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(982))),
-                produced_by: Some(NodeId(727)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(730)),
             },
         );
         ports.insert(
@@ -80306,7 +81231,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(878),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(729)),
+                produced_by: Some(NodeId(731)),
             },
         );
         ports.insert(
@@ -80314,30 +81239,30 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(879),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(730)),
+                produced_by: Some(NodeId(732)),
             },
         );
         ports.insert(
             PortId(880),
             Port {
                 id: PortId(880),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(731)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(128))),
+                produced_by: Some(NodeId(733)),
             },
         );
         ports.insert(
             PortId(881),
             Port {
                 id: PortId(881),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(159))),
-                produced_by: Some(NodeId(732)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(882),
             Port {
                 id: PortId(882),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(827))),
                 produced_by: None,
             },
         );
@@ -80345,7 +81270,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(883),
             Port {
                 id: PortId(883),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(230))),
+                state: PortState::Uninferred,
                 produced_by: None,
             },
         );
@@ -80354,15 +81279,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(884),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(734)),
+                produced_by: Some(NodeId(735)),
             },
         );
         ports.insert(
             PortId(885),
             Port {
                 id: PortId(885),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1618))),
-                produced_by: Some(NodeId(735)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(736)),
             },
         );
         ports.insert(
@@ -80370,7 +81295,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(886),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(737)),
             },
         );
         ports.insert(
@@ -80378,7 +81303,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(887),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(736)),
+                produced_by: Some(NodeId(738)),
             },
         );
         ports.insert(
@@ -80386,7 +81311,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(888),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(737)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -80394,7 +81319,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(889),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(738)),
+                produced_by: Some(NodeId(739)),
             },
         );
         ports.insert(
@@ -80402,7 +81327,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(890),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(739)),
+                produced_by: Some(NodeId(740)),
             },
         );
         ports.insert(
@@ -80410,7 +81335,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(891),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(740)),
+                produced_by: Some(NodeId(741)),
             },
         );
         ports.insert(
@@ -80418,7 +81343,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(892),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(741)),
+                produced_by: Some(NodeId(742)),
             },
         );
         ports.insert(
@@ -80426,7 +81351,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(893),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(742)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -80442,7 +81367,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(895),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(744)),
             },
         );
         ports.insert(
@@ -80450,7 +81375,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(896),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(744)),
+                produced_by: Some(NodeId(745)),
             },
         );
         ports.insert(
@@ -80458,7 +81383,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(897),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(745)),
+                produced_by: Some(NodeId(746)),
             },
         );
         ports.insert(
@@ -80466,7 +81391,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(898),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(746)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -80481,7 +81406,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(900),
             Port {
                 id: PortId(900),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(986))),
+                state: PortState::Uninferred,
                 produced_by: Some(NodeId(748)),
             },
         );
@@ -80489,16 +81414,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(901),
             Port {
                 id: PortId(901),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1222))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(749)),
             },
         );
         ports.insert(
             PortId(902),
             Port {
                 id: PortId(902),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(818))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(750)),
             },
         );
         ports.insert(
@@ -80514,7 +81439,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(904),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(750)),
+                produced_by: Some(NodeId(751)),
             },
         );
         ports.insert(
@@ -80522,7 +81447,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(905),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(752)),
             },
         );
         ports.insert(
@@ -80530,7 +81455,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(906),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(751)),
+                produced_by: Some(NodeId(753)),
             },
         );
         ports.insert(
@@ -80538,7 +81463,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(907),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(754)),
             },
         );
         ports.insert(
@@ -80546,7 +81471,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(908),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(752)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -80554,7 +81479,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(909),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(753)),
+                produced_by: Some(NodeId(755)),
             },
         );
         ports.insert(
@@ -80562,7 +81487,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(910),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(754)),
+                produced_by: Some(NodeId(756)),
             },
         );
         ports.insert(
@@ -80570,7 +81495,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(911),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(755)),
+                produced_by: Some(NodeId(757)),
             },
         );
         ports.insert(
@@ -80578,31 +81503,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(912),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(756)),
+                produced_by: Some(NodeId(758)),
             },
         );
         ports.insert(
             PortId(913),
             Port {
                 id: PortId(913),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1222))),
-                produced_by: Some(NodeId(757)),
+                state: PortState::Uninferred,
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(914),
             Port {
                 id: PortId(914),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(759)),
             },
         );
         ports.insert(
             PortId(915),
             Port {
                 id: PortId(915),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(827))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(760)),
             },
         );
         ports.insert(
@@ -80610,7 +81535,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(916),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(761)),
             },
         );
         ports.insert(
@@ -80618,7 +81543,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(917),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(759)),
+                produced_by: Some(NodeId(762)),
             },
         );
         ports.insert(
@@ -80626,7 +81551,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(918),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(760)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -80634,7 +81559,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(919),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(761)),
+                produced_by: Some(NodeId(763)),
             },
         );
         ports.insert(
@@ -80642,7 +81567,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(920),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(762)),
+                produced_by: Some(NodeId(764)),
             },
         );
         ports.insert(
@@ -80650,7 +81575,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(921),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(763)),
+                produced_by: Some(NodeId(765)),
             },
         );
         ports.insert(
@@ -80658,7 +81583,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(922),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(764)),
+                produced_by: Some(NodeId(766)),
             },
         );
         ports.insert(
@@ -80666,7 +81591,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(923),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(765)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -80674,7 +81599,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(924),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(767)),
             },
         );
         ports.insert(
@@ -80682,7 +81607,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(925),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(766)),
+                produced_by: Some(NodeId(768)),
             },
         );
         ports.insert(
@@ -80690,7 +81615,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(926),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(767)),
+                produced_by: Some(NodeId(769)),
             },
         );
         ports.insert(
@@ -80698,7 +81623,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(927),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(768)),
+                produced_by: Some(NodeId(770)),
             },
         );
         ports.insert(
@@ -80706,7 +81631,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(928),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(769)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -80714,7 +81639,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(929),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(770)),
+                produced_by: Some(NodeId(771)),
             },
         );
         ports.insert(
@@ -80722,7 +81647,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(930),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(771)),
+                produced_by: Some(NodeId(772)),
             },
         );
         ports.insert(
@@ -80730,7 +81655,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(931),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(772)),
+                produced_by: Some(NodeId(773)),
             },
         );
         ports.insert(
@@ -80738,95 +81663,95 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(932),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(774)),
             },
         );
         ports.insert(
             PortId(933),
             Port {
                 id: PortId(933),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(773)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2213))),
+                produced_by: Some(NodeId(775)),
             },
         );
         ports.insert(
             PortId(934),
             Port {
                 id: PortId(934),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(774)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(935),
             Port {
                 id: PortId(935),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(775)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(827))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(936),
             Port {
                 id: PortId(936),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(776)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2214))),
+                produced_by: Some(NodeId(777)),
             },
         );
         ports.insert(
             PortId(937),
             Port {
                 id: PortId(937),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(777)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2215))),
+                produced_by: Some(NodeId(779)),
             },
         );
         ports.insert(
             PortId(938),
             Port {
                 id: PortId(938),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(778)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2216))),
+                produced_by: Some(NodeId(781)),
             },
         );
         ports.insert(
             PortId(939),
             Port {
                 id: PortId(939),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(779)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2217))),
+                produced_by: Some(NodeId(783)),
             },
         );
         ports.insert(
             PortId(940),
             Port {
                 id: PortId(940),
-                state: PortState::Uninferred,
-                produced_by: None,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2218))),
+                produced_by: Some(NodeId(785)),
             },
         );
         ports.insert(
             PortId(941),
             Port {
                 id: PortId(941),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(780)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2219))),
+                produced_by: Some(NodeId(787)),
             },
         );
         ports.insert(
             PortId(942),
             Port {
                 id: PortId(942),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(781)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2221))),
+                produced_by: Some(NodeId(789)),
             },
         );
         ports.insert(
             PortId(943),
             Port {
                 id: PortId(943),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(782)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1214))),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -80834,7 +81759,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(944),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(783)),
+                produced_by: Some(NodeId(791)),
             },
         );
         ports.insert(
@@ -80842,23 +81767,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(945),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(784)),
+                produced_by: Some(NodeId(792)),
             },
         );
         ports.insert(
             PortId(946),
             Port {
                 id: PortId(946),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(785)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2223))),
+                produced_by: Some(NodeId(793)),
             },
         );
         ports.insert(
             PortId(947),
             Port {
                 id: PortId(947),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(786)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1039))),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -80866,23 +81791,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(948),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(795)),
             },
         );
         ports.insert(
             PortId(949),
             Port {
                 id: PortId(949),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(787)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2224))),
+                produced_by: Some(NodeId(796)),
             },
         );
         ports.insert(
             PortId(950),
             Port {
                 id: PortId(950),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(788)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1214))),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -80890,7 +81815,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(951),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(789)),
+                produced_by: Some(NodeId(798)),
             },
         );
         ports.insert(
@@ -80898,79 +81823,79 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(952),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(790)),
+                produced_by: Some(NodeId(799)),
             },
         );
         ports.insert(
             PortId(953),
             Port {
                 id: PortId(953),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(791)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2225))),
+                produced_by: Some(NodeId(800)),
             },
         );
         ports.insert(
             PortId(954),
             Port {
                 id: PortId(954),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(792)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1214))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(955),
             Port {
                 id: PortId(955),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(793)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1039))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(956),
             Port {
                 id: PortId(956),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2131))),
-                produced_by: Some(NodeId(794)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(802)),
             },
         );
         ports.insert(
             PortId(957),
             Port {
                 id: PortId(957),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(803)),
             },
         );
         ports.insert(
             PortId(958),
             Port {
                 id: PortId(958),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1222))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(804)),
             },
         );
         ports.insert(
             PortId(959),
             Port {
                 id: PortId(959),
-                state: PortState::Uninferred,
-                produced_by: None,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2226))),
+                produced_by: Some(NodeId(805)),
             },
         );
         ports.insert(
             PortId(960),
             Port {
                 id: PortId(960),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(796)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(961),
             Port {
                 id: PortId(961),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(797)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1214))),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -80978,7 +81903,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(962),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(798)),
+                produced_by: Some(NodeId(807)),
             },
         );
         ports.insert(
@@ -80986,7 +81911,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(963),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(799)),
+                produced_by: Some(NodeId(808)),
             },
         );
         ports.insert(
@@ -80994,7 +81919,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(964),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(800)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -81002,7 +81927,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(965),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(801)),
+                produced_by: Some(NodeId(809)),
             },
         );
         ports.insert(
@@ -81010,7 +81935,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(966),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(802)),
+                produced_by: Some(NodeId(810)),
             },
         );
         ports.insert(
@@ -81018,55 +81943,55 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(967),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(803)),
+                produced_by: Some(NodeId(811)),
             },
         );
         ports.insert(
             PortId(968),
             Port {
                 id: PortId(968),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(804)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2227))),
+                produced_by: Some(NodeId(812)),
             },
         );
         ports.insert(
             PortId(969),
             Port {
                 id: PortId(969),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(805)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(970),
             Port {
                 id: PortId(970),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(806)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1214))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(971),
             Port {
                 id: PortId(971),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(807)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1039))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(972),
             Port {
                 id: PortId(972),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(986))),
-                produced_by: Some(NodeId(808)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(814)),
             },
         );
         ports.insert(
             PortId(973),
             Port {
                 id: PortId(973),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1285))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(815)),
             },
         );
         ports.insert(
@@ -81082,7 +82007,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(975),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(810)),
+                produced_by: Some(NodeId(816)),
             },
         );
         ports.insert(
@@ -81090,7 +82015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(976),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(817)),
             },
         );
         ports.insert(
@@ -81098,15 +82023,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(977),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(811)),
+                produced_by: Some(NodeId(818)),
             },
         );
         ports.insert(
             PortId(978),
             Port {
                 id: PortId(978),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1287))),
-                produced_by: Some(NodeId(812)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2228))),
+                produced_by: Some(NodeId(819)),
             },
         );
         ports.insert(
@@ -81121,15 +82046,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(980),
             Port {
                 id: PortId(980),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2307))),
-                produced_by: Some(NodeId(814)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1214))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(981),
             Port {
                 id: PortId(981),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(806))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1043))),
                 produced_by: None,
             },
         );
@@ -81138,7 +82063,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(982),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(821)),
             },
         );
         ports.insert(
@@ -81146,7 +82071,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(983),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(816)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -81154,7 +82079,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(984),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(817)),
+                produced_by: Some(NodeId(822)),
             },
         );
         ports.insert(
@@ -81162,30 +82087,30 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(985),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(818)),
+                produced_by: Some(NodeId(823)),
             },
         );
         ports.insert(
             PortId(986),
             Port {
                 id: PortId(986),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(819)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2229))),
+                produced_by: Some(NodeId(824)),
             },
         );
         ports.insert(
             PortId(987),
             Port {
                 id: PortId(987),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(820)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(988),
             Port {
                 id: PortId(988),
-                state: PortState::Uninferred,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2230))),
                 produced_by: None,
             },
         );
@@ -81194,7 +82119,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(989),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(821)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -81202,7 +82127,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(990),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(822)),
+                produced_by: Some(NodeId(826)),
             },
         );
         ports.insert(
@@ -81210,7 +82135,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(991),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(823)),
+                produced_by: Some(NodeId(827)),
             },
         );
         ports.insert(
@@ -81218,7 +82143,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(992),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(824)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -81226,7 +82151,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(993),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(825)),
+                produced_by: Some(NodeId(828)),
             },
         );
         ports.insert(
@@ -81234,7 +82159,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(994),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(826)),
+                produced_by: Some(NodeId(829)),
             },
         );
         ports.insert(
@@ -81242,7 +82167,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(995),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(827)),
+                produced_by: Some(NodeId(830)),
             },
         );
         ports.insert(
@@ -81250,7 +82175,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(996),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(831)),
             },
         );
         ports.insert(
@@ -81258,7 +82183,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(997),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(828)),
+                produced_by: Some(NodeId(832)),
             },
         );
         ports.insert(
@@ -81266,30 +82191,30 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(998),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(829)),
+                produced_by: Some(NodeId(833)),
             },
         );
         ports.insert(
             PortId(999),
             Port {
                 id: PortId(999),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(830)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2231))),
+                produced_by: Some(NodeId(834)),
             },
         );
         ports.insert(
             PortId(1000),
             Port {
                 id: PortId(1000),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(230))),
-                produced_by: Some(NodeId(831)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(828))),
+                produced_by: None,
             },
         );
         ports.insert(
             PortId(1001),
             Port {
                 id: PortId(1001),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(806))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(827))),
                 produced_by: None,
             },
         );
@@ -81298,7 +82223,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(1002),
                 state: PortState::Uninferred,
-                produced_by: None,
+                produced_by: Some(NodeId(836)),
             },
         );
         ports.insert(
@@ -81306,7 +82231,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(1003),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(833)),
+                produced_by: Some(NodeId(837)),
             },
         );
         ports.insert(
@@ -81314,7 +82239,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(1004),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(834)),
+                produced_by: Some(NodeId(838)),
             },
         );
         ports.insert(
@@ -81322,7 +82247,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(1005),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(835)),
+                produced_by: Some(NodeId(839)),
             },
         );
         ports.insert(
@@ -81330,7 +82255,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(1006),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(836)),
+                produced_by: Some(NodeId(840)),
             },
         );
         ports.insert(
@@ -81338,23 +82263,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(1007),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(837)),
+                produced_by: Some(NodeId(841)),
             },
         );
         ports.insert(
             PortId(1008),
             Port {
                 id: PortId(1008),
-                state: PortState::Uninferred,
-                produced_by: None,
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2232))),
+                produced_by: Some(NodeId(842)),
             },
         );
         ports.insert(
             PortId(1009),
             Port {
                 id: PortId(1009),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(838)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1300))),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -81362,7 +82287,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(1010),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(839)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -81370,7 +82295,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(1011),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(840)),
+                produced_by: Some(NodeId(844)),
             },
         );
         ports.insert(
@@ -81378,7 +82303,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(1012),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(841)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -81386,23 +82311,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(1013),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(842)),
+                produced_by: Some(NodeId(845)),
             },
         );
         ports.insert(
             PortId(1014),
             Port {
                 id: PortId(1014),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(843)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1302))),
+                produced_by: Some(NodeId(846)),
             },
         );
         ports.insert(
             PortId(1015),
             Port {
                 id: PortId(1015),
-                state: PortState::Uninferred,
-                produced_by: Some(NodeId(844)),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(806))),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -81418,7 +82343,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(1017),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(845)),
+                produced_by: Some(NodeId(848)),
             },
         );
         ports.insert(
@@ -81426,7 +82351,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(1018),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(846)),
+                produced_by: Some(NodeId(849)),
             },
         );
         ports.insert(
@@ -81434,23 +82359,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(1019),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(847)),
+                produced_by: Some(NodeId(850)),
             },
         );
         ports.insert(
             PortId(1020),
             Port {
                 id: PortId(1020),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(230))),
-                produced_by: Some(NodeId(848)),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(851)),
             },
         );
         ports.insert(
             PortId(1021),
             Port {
                 id: PortId(1021),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(151))),
-                produced_by: None,
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(852)),
             },
         );
         ports.insert(
@@ -81458,7 +82383,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(1022),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(850)),
+                produced_by: None,
             },
         );
         ports.insert(
@@ -81466,7 +82391,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(1023),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(851)),
+                produced_by: Some(NodeId(853)),
             },
         );
         ports.insert(
@@ -81474,7 +82399,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(1024),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(852)),
+                produced_by: Some(NodeId(854)),
             },
         );
         ports.insert(
@@ -81482,7 +82407,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(1025),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(853)),
+                produced_by: Some(NodeId(855)),
             },
         );
         ports.insert(
@@ -81490,7 +82415,279 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             Port {
                 id: PortId(1026),
                 state: PortState::Uninferred,
-                produced_by: Some(NodeId(854)),
+                produced_by: Some(NodeId(856)),
+            },
+        );
+        ports.insert(
+            PortId(1027),
+            Port {
+                id: PortId(1027),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(857)),
+            },
+        );
+        ports.insert(
+            PortId(1028),
+            Port {
+                id: PortId(1028),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(858)),
+            },
+        );
+        ports.insert(
+            PortId(1029),
+            Port {
+                id: PortId(1029),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(859)),
+            },
+        );
+        ports.insert(
+            PortId(1030),
+            Port {
+                id: PortId(1030),
+                state: PortState::Uninferred,
+                produced_by: None,
+            },
+        );
+        ports.insert(
+            PortId(1031),
+            Port {
+                id: PortId(1031),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(860)),
+            },
+        );
+        ports.insert(
+            PortId(1032),
+            Port {
+                id: PortId(1032),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(861)),
+            },
+        );
+        ports.insert(
+            PortId(1033),
+            Port {
+                id: PortId(1033),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(862)),
+            },
+        );
+        ports.insert(
+            PortId(1034),
+            Port {
+                id: PortId(1034),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(230))),
+                produced_by: Some(NodeId(863)),
+            },
+        );
+        ports.insert(
+            PortId(1035),
+            Port {
+                id: PortId(1035),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(806))),
+                produced_by: None,
+            },
+        );
+        ports.insert(
+            PortId(1036),
+            Port {
+                id: PortId(1036),
+                state: PortState::Uninferred,
+                produced_by: None,
+            },
+        );
+        ports.insert(
+            PortId(1037),
+            Port {
+                id: PortId(1037),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(865)),
+            },
+        );
+        ports.insert(
+            PortId(1038),
+            Port {
+                id: PortId(1038),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(866)),
+            },
+        );
+        ports.insert(
+            PortId(1039),
+            Port {
+                id: PortId(1039),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(867)),
+            },
+        );
+        ports.insert(
+            PortId(1040),
+            Port {
+                id: PortId(1040),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(868)),
+            },
+        );
+        ports.insert(
+            PortId(1041),
+            Port {
+                id: PortId(1041),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(869)),
+            },
+        );
+        ports.insert(
+            PortId(1042),
+            Port {
+                id: PortId(1042),
+                state: PortState::Uninferred,
+                produced_by: None,
+            },
+        );
+        ports.insert(
+            PortId(1043),
+            Port {
+                id: PortId(1043),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(870)),
+            },
+        );
+        ports.insert(
+            PortId(1044),
+            Port {
+                id: PortId(1044),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(871)),
+            },
+        );
+        ports.insert(
+            PortId(1045),
+            Port {
+                id: PortId(1045),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(872)),
+            },
+        );
+        ports.insert(
+            PortId(1046),
+            Port {
+                id: PortId(1046),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(873)),
+            },
+        );
+        ports.insert(
+            PortId(1047),
+            Port {
+                id: PortId(1047),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(874)),
+            },
+        );
+        ports.insert(
+            PortId(1048),
+            Port {
+                id: PortId(1048),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(875)),
+            },
+        );
+        ports.insert(
+            PortId(1049),
+            Port {
+                id: PortId(1049),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(876)),
+            },
+        );
+        ports.insert(
+            PortId(1050),
+            Port {
+                id: PortId(1050),
+                state: PortState::Uninferred,
+                produced_by: None,
+            },
+        );
+        ports.insert(
+            PortId(1051),
+            Port {
+                id: PortId(1051),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(877)),
+            },
+        );
+        ports.insert(
+            PortId(1052),
+            Port {
+                id: PortId(1052),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(878)),
+            },
+        );
+        ports.insert(
+            PortId(1053),
+            Port {
+                id: PortId(1053),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(879)),
+            },
+        );
+        ports.insert(
+            PortId(1054),
+            Port {
+                id: PortId(1054),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(230))),
+                produced_by: Some(NodeId(880)),
+            },
+        );
+        ports.insert(
+            PortId(1055),
+            Port {
+                id: PortId(1055),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(151))),
+                produced_by: None,
+            },
+        );
+        ports.insert(
+            PortId(1056),
+            Port {
+                id: PortId(1056),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(882)),
+            },
+        );
+        ports.insert(
+            PortId(1057),
+            Port {
+                id: PortId(1057),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(883)),
+            },
+        );
+        ports.insert(
+            PortId(1058),
+            Port {
+                id: PortId(1058),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(884)),
+            },
+        );
+        ports.insert(
+            PortId(1059),
+            Port {
+                id: PortId(1059),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(885)),
+            },
+        );
+        ports.insert(
+            PortId(1060),
+            Port {
+                id: PortId(1060),
+                state: PortState::Uninferred,
+                produced_by: Some(NodeId(886)),
             },
         );
         ports
@@ -81509,140 +82706,140 @@ fn bootstrapped_fixture_without_parse_surface_dag_optional_match_disjs(
 ) -> HashMap<DeclarationId, DeclarationId> {
     {
         let mut map = HashMap::new();
-        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.insert(DeclarationId(389), DeclarationId(2499));
+        map.insert(DeclarationId(391), DeclarationId(2502));
+        map.insert(DeclarationId(423), DeclarationId(2505));
+        map.insert(DeclarationId(426), DeclarationId(2508));
+        map.insert(DeclarationId(471), DeclarationId(2511));
+        map.insert(DeclarationId(472), DeclarationId(2514));
+        map.insert(DeclarationId(473), DeclarationId(2517));
+        map.insert(DeclarationId(513), DeclarationId(2520));
+        map.insert(DeclarationId(515), DeclarationId(2523));
+        map.insert(DeclarationId(516), DeclarationId(2526));
+        map.insert(DeclarationId(539), DeclarationId(2529));
+        map.insert(DeclarationId(582), DeclarationId(2532));
+        map.insert(DeclarationId(602), DeclarationId(2535));
+        map.insert(DeclarationId(603), DeclarationId(2538));
+        map.insert(DeclarationId(605), DeclarationId(2541));
+        map.insert(DeclarationId(608), DeclarationId(2544));
+        map.insert(DeclarationId(613), DeclarationId(2547));
+        map.insert(DeclarationId(614), DeclarationId(2550));
+        map.insert(DeclarationId(618), DeclarationId(2553));
+        map.insert(DeclarationId(619), DeclarationId(2556));
+        map.insert(DeclarationId(620), DeclarationId(2559));
+        map.insert(DeclarationId(625), DeclarationId(2562));
+        map.insert(DeclarationId(1453), DeclarationId(2565));
+        map.insert(DeclarationId(1457), DeclarationId(2568));
+        map.insert(DeclarationId(1460), DeclarationId(2571));
+        map.insert(DeclarationId(1462), DeclarationId(2574));
+        map.insert(DeclarationId(1463), DeclarationId(2577));
+        map.insert(DeclarationId(1464), DeclarationId(2580));
+        map.insert(DeclarationId(1518), DeclarationId(2583));
+        map.insert(DeclarationId(1519), DeclarationId(2586));
+        map.insert(DeclarationId(1520), DeclarationId(2589));
+        map.insert(DeclarationId(1521), DeclarationId(2592));
+        map.insert(DeclarationId(1522), DeclarationId(2595));
+        map.insert(DeclarationId(1523), DeclarationId(2598));
+        map.insert(DeclarationId(1529), DeclarationId(2601));
+        map.insert(DeclarationId(1584), DeclarationId(2604));
+        map.insert(DeclarationId(1587), DeclarationId(2607));
+        map.insert(DeclarationId(1588), DeclarationId(2610));
+        map.insert(DeclarationId(1589), DeclarationId(2613));
+        map.insert(DeclarationId(1590), DeclarationId(2616));
+        map.insert(DeclarationId(1613), DeclarationId(2619));
+        map.insert(DeclarationId(1618), DeclarationId(2622));
+        map.insert(DeclarationId(1622), DeclarationId(2625));
+        map.insert(DeclarationId(1625), DeclarationId(2628));
+        map.insert(DeclarationId(1626), DeclarationId(2631));
+        map.insert(DeclarationId(1657), DeclarationId(2634));
+        map.insert(DeclarationId(1658), DeclarationId(2637));
+        map.insert(DeclarationId(1662), DeclarationId(2640));
+        map.insert(DeclarationId(1663), DeclarationId(2643));
+        map.insert(DeclarationId(1674), DeclarationId(2646));
+        map.insert(DeclarationId(1675), DeclarationId(2649));
+        map.insert(DeclarationId(1677), DeclarationId(2652));
+        map.insert(DeclarationId(1678), DeclarationId(2655));
+        map.insert(DeclarationId(1680), DeclarationId(2658));
+        map.insert(DeclarationId(1681), DeclarationId(2661));
+        map.insert(DeclarationId(1683), DeclarationId(2664));
+        map.insert(DeclarationId(1685), DeclarationId(2667));
+        map.insert(DeclarationId(1688), DeclarationId(2670));
+        map.insert(DeclarationId(1692), DeclarationId(2673));
+        map.insert(DeclarationId(1694), DeclarationId(2676));
+        map.insert(DeclarationId(1696), DeclarationId(2679));
+        map.insert(DeclarationId(1706), DeclarationId(2682));
+        map.insert(DeclarationId(1707), DeclarationId(2685));
+        map.insert(DeclarationId(1708), DeclarationId(2688));
+        map.insert(DeclarationId(1711), DeclarationId(2691));
+        map.insert(DeclarationId(1712), DeclarationId(2694));
+        map.insert(DeclarationId(1714), DeclarationId(2697));
+        map.insert(DeclarationId(1715), DeclarationId(2700));
+        map.insert(DeclarationId(1783), DeclarationId(2703));
+        map.insert(DeclarationId(1784), DeclarationId(2706));
+        map.insert(DeclarationId(1785), DeclarationId(2709));
+        map.insert(DeclarationId(1786), DeclarationId(2712));
+        map.insert(DeclarationId(1837), DeclarationId(2715));
+        map.insert(DeclarationId(1838), DeclarationId(2718));
+        map.insert(DeclarationId(1839), DeclarationId(2721));
+        map.insert(DeclarationId(1840), DeclarationId(2724));
+        map.insert(DeclarationId(1841), DeclarationId(2727));
+        map.insert(DeclarationId(1842), DeclarationId(2730));
+        map.insert(DeclarationId(1865), DeclarationId(2733));
+        map.insert(DeclarationId(2028), DeclarationId(2736));
+        map.insert(DeclarationId(2029), DeclarationId(2739));
+        map.insert(DeclarationId(2030), DeclarationId(2742));
+        map.insert(DeclarationId(2033), DeclarationId(2745));
+        map.insert(DeclarationId(2034), DeclarationId(2748));
+        map.insert(DeclarationId(2063), DeclarationId(2751));
+        map.insert(DeclarationId(2064), DeclarationId(2754));
+        map.insert(DeclarationId(2070), DeclarationId(2757));
+        map.insert(DeclarationId(2071), DeclarationId(2760));
+        map.insert(DeclarationId(2072), DeclarationId(2763));
+        map.insert(DeclarationId(2073), DeclarationId(2766));
+        map.insert(DeclarationId(2074), DeclarationId(2769));
+        map.insert(DeclarationId(2075), DeclarationId(2772));
+        map.insert(DeclarationId(2331), DeclarationId(2775));
+        map.insert(DeclarationId(2360), DeclarationId(2778));
+        map.insert(DeclarationId(2366), DeclarationId(2781));
+        map.insert(DeclarationId(2371), DeclarationId(2784));
+        map.insert(DeclarationId(2374), DeclarationId(2787));
+        map.insert(DeclarationId(2375), DeclarationId(2790));
+        map.insert(DeclarationId(2395), DeclarationId(2793));
+        map.insert(DeclarationId(2396), DeclarationId(2796));
+        map.insert(DeclarationId(2404), DeclarationId(2799));
+        map.insert(DeclarationId(2408), DeclarationId(2802));
+        map.insert(DeclarationId(2410), DeclarationId(2805));
+        map.insert(DeclarationId(2411), DeclarationId(2808));
+        map.insert(DeclarationId(2412), DeclarationId(2811));
+        map.insert(DeclarationId(2413), DeclarationId(2814));
+        map.insert(DeclarationId(2414), DeclarationId(2817));
+        map.insert(DeclarationId(2420), DeclarationId(2820));
+        map.insert(DeclarationId(2422), DeclarationId(2823));
+        map.insert(DeclarationId(2423), DeclarationId(2826));
+        map.insert(DeclarationId(2435), DeclarationId(2829));
+        map.insert(DeclarationId(2436), DeclarationId(2832));
+        map.insert(DeclarationId(2438), DeclarationId(2835));
+        map.insert(DeclarationId(2439), DeclarationId(2838));
+        map.insert(DeclarationId(2440), DeclarationId(2841));
+        map.insert(DeclarationId(2441), DeclarationId(2844));
+        map.insert(DeclarationId(2443), DeclarationId(2847));
+        map.insert(DeclarationId(2444), DeclarationId(2850));
+        map.insert(DeclarationId(2446), DeclarationId(2853));
+        map.insert(DeclarationId(2448), DeclarationId(2856));
+        map.insert(DeclarationId(2449), DeclarationId(2859));
+        map.insert(DeclarationId(2450), DeclarationId(2862));
+        map.insert(DeclarationId(2457), DeclarationId(2865));
+        map.insert(DeclarationId(2458), DeclarationId(2868));
+        map.insert(DeclarationId(2459), DeclarationId(2871));
+        map.insert(DeclarationId(2461), DeclarationId(2874));
+        map.insert(DeclarationId(2462), DeclarationId(2877));
+        map.insert(DeclarationId(2463), DeclarationId(2880));
+        map.insert(DeclarationId(2465), DeclarationId(2883));
+        map.insert(DeclarationId(2466), DeclarationId(2886));
+        map.insert(DeclarationId(2467), DeclarationId(2889));
+        map.insert(DeclarationId(2474), DeclarationId(2892));
+        map.insert(DeclarationId(2476), DeclarationId(2895));
+        map.insert(DeclarationId(2487), DeclarationId(2898));
         map
     }
 }
diff --git a/src/v3/compiler/src/complexity_lens_generated.rs b/src/v3/compiler/src/complexity_lens_generated.rs
index 7994cc0c3da..8c39d3e1d7d 100644
--- a/src/v3/compiler/src/complexity_lens_generated.rs
+++ b/src/v3/compiler/src/complexity_lens_generated.rs
@@ -552,9 +552,9 @@ pub fn meet_pair(p0: &Certainty, p1: Certainty) -> Certainty {
 pub fn complexity_enforcement_project(p0: &ComplexitySummary) -> AsymptoticClass {
     ((p0).asymptotic_class).clone()
 }
-pub fn complexity_enforcement_violates(p0: &AsymptoticClass, p1: &AsymptoticClass) -> bool {
-    if asymptotic_dominates(p1, p0) {
-        if asymptotic_dominates(p0, p1) {
+pub fn complexity_enforcement_violates(p0: &ComplexitySummary, p1: &AsymptoticClass) -> bool {
+    if asymptotic_dominates(&((p0).asymptotic_class), p1) {
+        if asymptotic_dominates(p1, &((p0).asymptotic_class)) {
             (0 == 1)
         } else {
             (0 == 0)
diff --git a/src/v3/compiler/src/emit.rs b/src/v3/compiler/src/emit.rs
index b792c26be2d..d1420cf68e2 100644
--- a/src/v3/compiler/src/emit.rs
+++ b/src/v3/compiler/src/emit.rs
@@ -2398,8 +2398,23 @@ impl<'a> Ctx<'a> {
                             &[("key", &key_name), ("value", &value_name)],
                         ))
                     }
+                    [key, value, extra] => {
+                        let key_name = self.go_type_name_for_decl_at_depth(key.value, depth + 1)?;
+                        let value_name =
+                            self.go_type_name_for_decl_at_depth(value.value, depth + 1)?;
+                        let extra_name =
+                            self.go_type_name_for_decl_at_depth(extra.value, depth + 1)?;
+                        Ok(render_named_template(
+                            &binding.carrier,
+                            &[
+                                ("key", &key_name),
+                                ("value", &value_name),
+                                ("extra", &extra_name),
+                            ],
+                        ))
+                    }
                     _ => Err(EmitError::UnsupportedBehavior(
-                        "instantiated type carrier only supports arities 1 and 2".to_string(),
+                        "instantiated type carrier only supports arities 1, 2, and 3".to_string(),
                     )),
                 }
             }
diff --git a/src/v3/compiler/src/emit/python_target.rs b/src/v3/compiler/src/emit/python_target.rs
index cd4edad9e30..72b06117a65 100644
--- a/src/v3/compiler/src/emit/python_target.rs
+++ b/src/v3/compiler/src/emit/python_target.rs
@@ -1640,8 +1640,24 @@ impl<'a> Ctx<'a> {
                             &[("key", &key_name), ("value", &value_name)],
                         ))
                     }
+                    [key, value, extra] => {
+                        let key_name =
+                            self.python_type_name_for_decl_at_depth(key.value, depth + 1)?;
+                        let value_name =
+                            self.python_type_name_for_decl_at_depth(value.value, depth + 1)?;
+                        let extra_name =
+                            self.python_type_name_for_decl_at_depth(extra.value, depth + 1)?;
+                        Ok(render_named_template(
+                            carrier,
+                            &[
+                                ("key", &key_name),
+                                ("value", &value_name),
+                                ("extra", &extra_name),
+                            ],
+                        ))
+                    }
                     _ => Err(EmitPythonError::Unsupported(
-                        "python type instantiation supports arities 1 and 2".to_string(),
+                        "python type instantiation supports arities 1, 2, and 3".to_string(),
                     )),
                 }
             }
diff --git a/src/v3/compiler/src/emit/rust_target.rs b/src/v3/compiler/src/emit/rust_target.rs
index d1075b42772..ba09c18ab99 100644
--- a/src/v3/compiler/src/emit/rust_target.rs
+++ b/src/v3/compiler/src/emit/rust_target.rs
@@ -5757,8 +5757,30 @@ impl<'a> Ctx<'a> {
                     &[("key", &key_name), ("value", &value_name)],
                 ))
             }
+            [key, value, extra] => {
+                let key_name =
+                    self.rust_type_name_for_decl_with_policy(key.value, depth + 1, arrow_policy)?;
+                let value_name = self.rust_type_name_for_decl_with_policy(
+                    value.value,
+                    depth + 1,
+                    arrow_policy,
+                )?;
+                let extra_name = self.rust_type_name_for_decl_with_policy(
+                    extra.value,
+                    depth + 1,
+                    arrow_policy,
+                )?;
+                Ok(render_named_template(
+                    &binding.carrier,
+                    &[
+                        ("key", &key_name),
+                        ("value", &value_name),
+                        ("extra", &extra_name),
+                    ],
+                ))
+            }
             _ => Err(EmitError::UnsupportedBehavior(format!(
-                "instantiated type carrier for declaration {:?} only supports arities 1 and 2 at PR scope",
+                "instantiated type carrier for declaration {:?} only supports arities 1, 2, and 3 at PR scope",
                 template
             ))),
         }
diff --git a/src/v3/compiler/src/enforced_lens_application.rs b/src/v3/compiler/src/enforced_lens_application.rs
index 7f599e7704d..d630542c160 100644
--- a/src/v3/compiler/src/enforced_lens_application.rs
+++ b/src/v3/compiler/src/enforced_lens_application.rs
@@ -15,12 +15,25 @@
 //! `LensEnforcement` projection + violation relation as `complexity.dag`
 //! (`complexity_enforcement_project` / `complexity_enforcement_violates`, surfaced
 //! through `complexity_lens_generated`) and attaches a compile diagnostic on violation.
+//!
+//! Gate #58 (`apply_lens_self_application_demonstrated`): when a program authors
+//! `EnforcedApplication<TimingMeasurement, TimingBudget, TimingEnforcementProjected>` referencing `timing_enforceable`
+//! (`v3.std.timing_lens`), infer reads the **lowered** `TimingMeasurement` from the
+//! `DeclarationScope` subject's structural `measurement` field **only after** verifying the
+//! subject row's **nominal** `data …: RowTy = …` type declares `measurement: TimingMeasurement`
+//! on `RowTy` (API-level contract; avoids unrelated records that merely spell a `measurement`
+//! label). The same usage ceiling as `timing_enforcement_project` / `timing_enforcement_violates`
+//! in `timing_lens.dag` applies: non-`Observed` reports are enforced via a **variant-shaped**
+//! fault path (never compared as ordinary wall-clock `Nat` against the fault sentinel), while
+//! `Observed` wall-clock nanoseconds use the same strict `>` edge as gate #94 against
+//! `TimingBudget.max`.
 
 use std::collections::HashMap;
 
 use crate::dag::{
-    literal_decimal_i64, positive_descent_count, ArrowBody, AsymptoticClass, Dag, DeclarationId,
-    FieldValue, LiteralBits, Lookup, PortId, PositiveDescentAmount, TypeConnective, ValueBody,
+    literal_decimal_i64, positive_descent_count, ArrowBody, AsymptoticClass, Behavior, Dag,
+    DeclarationId, FieldValue, LiteralBits, Lookup, PortId, PositiveDescentAmount, TypeConnective,
+    ValueBody,
 };
 use crate::diagnostics::{Diagnostic, SourceSpan};
 use crate::lens_cost::{
@@ -53,8 +66,220 @@ fn attach_missing_diagnostic_severity_substrate_diagnostic(
     });
 }
 
-/// Fail-closed check for landed complexity enforcement applications.
-pub(crate) fn check_enforced_lens_applications(dag: &mut Dag) {
+/// Reads `timing_enforcement_fault_sentinel_count` from the lowered `timing_lens.dag` declaration
+/// body (nullary `fn` → bind → [`ValueNode`]), matching substrate authority instead of duplicating
+/// the decimal literal in Rust.
+fn timing_enforcement_fault_sentinel_ns_from_substrate(dag: &Dag) -> Option<u64> {
+    let decl = dag.declarations().iter().find(|d| {
+        d.name.as_deref() == Some("timing_enforcement_fault_sentinel_count")
+            && d.span.file.ends_with("timing_lens.dag")
+    })?;
+    let TypeConnective::Arrow {
+        body: ArrowBody::UserDefined(bind_id),
+        ..
+    } = &decl.connective
+    else {
+        return None;
+    };
+    let bind = (*bind_id).bind_opt(dag)?;
+    let producer = dag.resolve_producer_opt(&bind.value)?;
+    let Behavior::Value(vn) = producer else {
+        return None;
+    };
+    let LiteralBits::Int(s) = &vn.data else {
+        return None;
+    };
+    s.parse().ok()
+}
+
+fn timing_measurement_sum_type_decl_id(dag: &Dag) -> Option<DeclarationId> {
+    dag.declarations()
+        .iter()
+        .find(|d| {
+            d.name.as_deref() == Some("TimingMeasurement")
+                && d.span.file.ends_with("timing_lens.dag")
+        })
+        .map(|d| d.id)
+}
+
+fn peel_type_declaration_head(dag: &Dag, mut id: DeclarationId) -> DeclarationId {
+    const MAX: usize = 64;
+    for _ in 0..MAX {
+        match &dag.declaration(id).connective {
+            TypeConnective::Instantiation {
+                template,
+                arguments,
+            } if arguments.is_empty() => {
+                id = *template;
+            }
+            TypeConnective::Atom(ap) => {
+                let Some(next) = ap.resolved_id() else {
+                    break;
+                };
+                id = next;
+            }
+            _ => break,
+        }
+    }
+    id
+}
+
+/// Returns the nominal `RowTy` declaration id for a lowered `data row: RowTy = …` value row.
+fn data_row_nominal_type_decl_id(dag: &Dag, value_decl_id: DeclarationId) -> Option<DeclarationId> {
+    match &dag.declaration(value_decl_id).connective {
+        TypeConnective::Instantiation {
+            template,
+            arguments,
+        } if arguments.is_empty() => Some(*template),
+        _ => None,
+    }
+}
+
+/// True when `RowTy` (after alias peel) is a conj that declares `measurement` with type peeling
+/// to the substrate `TimingMeasurement` sum at `tm_disj`.
+fn timing_section_row_type_declares_measurement_tm(
+    dag: &Dag,
+    section_value_decl_id: DeclarationId,
+    tm_disj: DeclarationId,
+) -> bool {
+    let Some(row_ty) = data_row_nominal_type_decl_id(dag, section_value_decl_id) else {
+        return false;
+    };
+    let ty_head = peel_type_declaration_head(dag, row_ty);
+    let TypeConnective::Conj { children } = &dag.declaration(ty_head).connective else {
+        return false;
+    };
+    let tm_head = peel_type_declaration_head(dag, tm_disj);
+    children
+        .iter()
+        .any(|f| f.label == "measurement" && peel_type_declaration_head(dag, f.ty) == tm_head)
+}
+
+/// Lowered `TimingMeasurement` usage for timing `EnforcedApplication` enforcement.
+///
+/// Separates non-evidence variants from `Observed` wall-clock nanoseconds so a legitimate
+/// `Observed` duration equal to the substrate fault sentinel `Nat` cannot be conflated with
+/// `Unobserved` / `Ambiguous` / `Stale` (INVARIANTS P2 / modeling-discipline Practice 2).
+///
+/// Practice 4 (`docs/modeling-discipline.md`, coproduct checkpoint): **GREEN (terminal)** — mirrors
+/// `timing_enforcement_project` / `timing_enforcement_violates` in `timing_lens.dag` on the lowered
+/// `TimingMeasurement` witness (substrate `LensEnforcement.violates` now takes `TimingMeasurement`
+/// × `TimingBudget` per `lens_application.dag`; gate #58 / codex 10994).
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub(crate) enum TimingMeasurementEnforcementUsage {
+    NonObservedFault,
+    ObservedWallNs(u64),
+}
+
+/// Interprets a lowered `TimingMeasurement` value the same way `timing_enforcement_project` does
+/// on the substrate (`timing_lens.dag`): `Observed` → wall-clock nanoseconds; other report variants
+/// classify as [`TimingMeasurementEnforcementUsage::NonObservedFault`] (not as a raw `Nat`).
+fn timing_measurement_enforcement_usage(
+    dag: &Dag,
+    tm_disj: DeclarationId,
+    value: &FieldValue,
+) -> Option<TimingMeasurementEnforcementUsage> {
+    let TypeConnective::Disj { variants } = &dag.declaration(tm_disj).connective else {
+        return None;
+    };
+    let FieldValue::Variant {
+        constructor,
+        payload,
+    } = value
+    else {
+        return None;
+    };
+    let variant = variants.iter().find(|v| v.ty == *constructor)?;
+    match variant.label.as_str() {
+        "Observed" => observed_timing_payload_max_ns(payload)
+            .map(TimingMeasurementEnforcementUsage::ObservedWallNs),
+        "Unobserved" | "Ambiguous" | "Stale" => {
+            Some(TimingMeasurementEnforcementUsage::NonObservedFault)
+        }
+        _ => None,
+    }
+}
+
+/// Same reflexive edge as `timing_enforcement_violates` in `timing_lens.dag` on the lowered witness,
+/// using the same `>` edge as substrate `Observed` enforcement (no `TimingBudget` sentinel equality
+/// on the observed path).
+pub(crate) fn timing_enforcement_violates(
+    declared_max_ns: u64,
+    usage: TimingMeasurementEnforcementUsage,
+) -> bool {
+    match usage {
+        TimingMeasurementEnforcementUsage::NonObservedFault => true,
+        TimingMeasurementEnforcementUsage::ObservedWallNs(ns) => ns > declared_max_ns,
+    }
+}
+
+fn observed_timing_payload_max_ns(payload: &[FieldValue]) -> Option<u64> {
+    let FieldValue::Record(parts) = payload.first()? else {
+        return None;
+    };
+    if let Some((_, v)) = parts.iter().find(|(label, _)| label == "duration") {
+        return field_value_nat_magnitude(v);
+    }
+    field_value_nat_magnitude(&FieldValue::Record(parts.clone()))
+}
+
+fn field_value_nat_magnitude(value: &FieldValue) -> Option<u64> {
+    match value {
+        FieldValue::Literal(LiteralBits::Int(s)) => s.parse().ok(),
+        FieldValue::Record(parts) => parts
+            .iter()
+            .find(|(label, _)| label == "count")
+            .and_then(|(_, v)| field_value_nat_magnitude(v)),
+        _ => None,
+    }
+}
+
+fn field_value_timing_budget_max_ns(value: &FieldValue) -> Option<u64> {
+    let FieldValue::Record(parts) = value else {
+        return None;
+    };
+    let max = parts
+        .iter()
+        .find(|(label, _)| label == "max")
+        .map(|(_, v)| v)?;
+    field_value_nat_magnitude(max)
+}
+
+fn is_timing_enforceable_lens_value(
+    value: &FieldValue,
+    timing_enforceable_id: Option<DeclarationId>,
+    timing_lens_id: Option<DeclarationId>,
+    timing_enforcement_id: Option<DeclarationId>,
+) -> bool {
+    if let (Some(bundle), FieldValue::Reference(id)) = (timing_enforceable_id, value) {
+        if *id == bundle {
+            return true;
+        }
+    }
+    let (Some(lens_id), Some(enforcement_id)) = (timing_lens_id, timing_enforcement_id) else {
+        return false;
+    };
+    let FieldValue::Record(parts) = value else {
+        return false;
+    };
+    let mut lens_ref: Option<DeclarationId> = None;
+    let mut enforcement_ref: Option<DeclarationId> = None;
+    for (label, field) in parts {
+        match (label.as_str(), field) {
+            ("lens", FieldValue::Reference(r)) => lens_ref = Some(*r),
+            ("enforcement", FieldValue::Reference(r)) => enforcement_ref = Some(*r),
+            _ => {}
+        }
+    }
+    lens_ref == Some(lens_id) && enforcement_ref == Some(enforcement_id)
+}
+
+/// Fail-closed check for landed complexity + timing enforcement applications.
+///
+/// Exported at the crate root (`v3_compiler::check_enforced_lens_applications`) so integration
+/// tests can re-invoke the same post-infer pass as `infer::infer` without treating declaration
+/// presence as proof the probe ran (gate #58 receipt).
+pub fn check_enforced_lens_applications(dag: &mut Dag) {
     let Some(enforced_template) = dag
         .declarations()
         .iter()
@@ -66,27 +291,44 @@ pub(crate) fn check_enforced_lens_applications(dag: &mut Dag) {
     else {
         return;
     };
-    let Some(complexity_enforceable_id) = dag
+    let complexity_enforceable_id = dag
         .declarations()
         .iter()
         .find(|d| {
             d.name.as_deref() == Some("complexity_enforceable")
                 && d.span.file.ends_with("complexity.dag")
         })
-        .map(|d| d.id)
-    else {
-        return;
-    };
-    let Some(asymptotic_disj) = dag
+        .map(|d| d.id);
+    let timing_enforceable_id = dag
+        .declarations()
+        .iter()
+        .find(|d| {
+            d.name.as_deref() == Some("timing_enforceable")
+                && d.span.file.ends_with("timing_lens.dag")
+        })
+        .map(|d| d.id);
+    let timing_lens_id = dag
+        .declarations()
+        .iter()
+        .find(|d| {
+            d.name.as_deref() == Some("timing_lens") && d.span.file.ends_with("timing_lens.dag")
+        })
+        .map(|d| d.id);
+    let timing_enforcement_id = dag
+        .declarations()
+        .iter()
+        .find(|d| {
+            d.name.as_deref() == Some("timing_enforcement")
+                && d.span.file.ends_with("timing_lens.dag")
+        })
+        .map(|d| d.id);
+    let asymptotic_disj = dag
         .declarations()
         .iter()
         .find(|d| {
             d.name.as_deref() == Some("AsymptoticClass") && d.span.file.ends_with("algebra.dag")
         })
-        .map(|d| d.id)
-    else {
-        return;
-    };
+        .map(|d| d.id);
     let Some(section_ref_disj) = dag
         .declarations()
         .iter()
@@ -124,101 +366,278 @@ pub(crate) fn check_enforced_lens_applications(dag: &mut Dag) {
             continue;
         }
         let fm = field_map(fields);
-        let enforceable = match fm.get("enforceable_lens") {
-            Some(FieldValue::Reference(id)) => *id,
+        let enforceable_lens = match fm.get("enforceable_lens") {
+            Some(v) => v,
             _ => continue,
         };
-        if enforceable != complexity_enforceable_id {
-            continue;
-        }
         let section = match fm.get("section") {
             Some(v) => *v,
             _ => continue,
         };
-        let Some(fn_decl) =
-            resolve_declaration_scope_fn(dag, section, section_ref_disj, declaration_scope_conj)
-        else {
-            violations.push(Diagnostic::ParseError {
-                message: "lens enforcement: could not resolve function declaration for section"
-                    .to_string(),
-                span: decl.span.clone(),
-                fixes: Vec::new(),
-            });
-            continue;
-        };
-        let Some(port) = fn_result_port(dag, fn_decl) else {
-            violations.push(Diagnostic::ParseError {
-                message: "lens enforcement: could not resolve function result port for section"
-                    .to_string(),
-                span: decl.span.clone(),
-                fixes: Vec::new(),
-            });
-            continue;
-        };
         let budget_val = match fm.get("budget") {
             Some(v) => *v,
             _ => continue,
         };
-        let Some(budget_class) =
-            field_value_asymptotic_class(dag, asymptotic_disj, positive_descent_disj, budget_val)
-        else {
-            violations.push(Diagnostic::ParseError {
-                message: "lens enforcement: could not read complexity budget `AsymptoticClass` \
-                          (ill-formed `ClassPolynomial` budgets must use Peano `degree` ≥ 3; \
-                          use `ClassLinear` / `ClassQuadratic` for sub-cubic tiers)"
-                    .to_string(),
-                span: decl.span.clone(),
-                fixes: Vec::new(),
-            });
-            continue;
-        };
         let span = match fm.get("span") {
             Some(FieldValue::Record(span_fields)) => record_as_source_span(span_fields),
             _ => None,
         }
         .unwrap_or_else(|| decl.span.clone());
 
-        let observed = match complexity_of(dag, &port) {
-            Lookup::Hit(s) => complexity_enforcement_project(&s),
-            Lookup::Miss => {
-                violations.push(Diagnostic::ParseError {
-                    message: "lens enforcement: complexity lens returned Miss for section — \
-                              cannot enforce budget"
-                        .to_string(),
-                    span: span.clone(),
-                    fixes: Vec::new(),
-                });
+        if let (Some(cid), FieldValue::Reference(ref_id)) =
+            (complexity_enforceable_id, enforceable_lens)
+        {
+            if *ref_id == cid {
+                let Some(asymptotic_disj) = asymptotic_disj else {
+                    violations.push(Diagnostic::ParseError {
+                        message:
+                            "lens enforcement: could not resolve substrate `AsymptoticClass` from \
+                              `algebra.dag` (modeled authority missing; fail-closed)"
+                                .to_string(),
+                        span: decl.span.clone(),
+                        fixes: Vec::new(),
+                    });
+                    continue;
+                };
+                let Some(fn_decl) = resolve_declaration_scope_fn(
+                    dag,
+                    section,
+                    section_ref_disj,
+                    declaration_scope_conj,
+                ) else {
+                    violations.push(Diagnostic::ParseError {
+                        message:
+                            "lens enforcement: could not resolve function declaration for section"
+                                .to_string(),
+                        span: decl.span.clone(),
+                        fixes: Vec::new(),
+                    });
+                    continue;
+                };
+                let Some(port) = fn_result_port(dag, fn_decl) else {
+                    violations.push(Diagnostic::ParseError {
+                        message:
+                            "lens enforcement: could not resolve function result port for section"
+                                .to_string(),
+                        span: decl.span.clone(),
+                        fixes: Vec::new(),
+                    });
+                    continue;
+                };
+                let Some(budget_class) = field_value_asymptotic_class(
+                    dag,
+                    asymptotic_disj,
+                    positive_descent_disj,
+                    budget_val,
+                ) else {
+                    violations.push(Diagnostic::ParseError {
+                        message:
+                            "lens enforcement: could not read complexity budget `AsymptoticClass` \
+                              (ill-formed `ClassPolynomial` budgets must use Peano `degree` ≥ 3; \
+                              use `ClassLinear` / `ClassQuadratic` for sub-cubic tiers)"
+                                .to_string(),
+                        span: decl.span.clone(),
+                        fixes: Vec::new(),
+                    });
+                    continue;
+                };
+
+                let summary = match complexity_of(dag, &port) {
+                    Lookup::Hit(s) => s,
+                    Lookup::Miss => {
+                        violations.push(Diagnostic::ParseError {
+                            message:
+                                "lens enforcement: complexity lens returned Miss for section — \
+                                  cannot enforce budget"
+                                    .to_string(),
+                            span: span.clone(),
+                            fixes: Vec::new(),
+                        });
+                        continue;
+                    }
+                };
+                if !complexity_enforcement_violates(&summary, &budget_class) {
+                    continue;
+                }
+                let observed = complexity_enforcement_project(&summary);
+                let severity_val = match fm.get("diagnostic_severity") {
+                    Some(v) => *v,
+                    _ => {
+                        violations.push(Diagnostic::ParseError {
+                            message:
+                                "lens enforcement: `EnforcedApplication` missing `diagnostic_severity`"
+                                    .to_string(),
+                            span: decl.span.clone(),
+                            fixes: Vec::new(),
+                        });
+                        continue;
+                    }
+                };
+                let violation_message = format!(
+                    "lens enforcement violation: complexity budget {budget_class:?} exceeded \
+                 by observed class {observed:?} (declared `EnforcedApplication` at {})",
+                    decl.name.as_deref().unwrap_or("?")
+                );
+                violations.push(enforced_violation_diagnostic(
+                    dag,
+                    diagnostic_severity_disj,
+                    severity_val,
+                    violation_message,
+                    span,
+                ));
                 continue;
             }
-        };
-        if !complexity_enforcement_violates(&budget_class, &observed) {
-            continue;
         }
-        let severity_val = match fm.get("diagnostic_severity") {
-            Some(v) => *v,
-            _ => {
+
+        if is_timing_enforceable_lens_value(
+            enforceable_lens,
+            timing_enforceable_id,
+            timing_lens_id,
+            timing_enforcement_id,
+        ) {
+            let Some(tm_disj) = timing_measurement_sum_type_decl_id(dag) else {
                 violations.push(Diagnostic::ParseError {
                     message:
-                        "lens enforcement: `EnforcedApplication` missing `diagnostic_severity`"
+                        "lens enforcement: could not resolve substrate `TimingMeasurement` from \
+                              `timing_lens.dag` (modeled authority missing; fail-closed)"
                             .to_string(),
                     span: decl.span.clone(),
                     fixes: Vec::new(),
                 });
                 continue;
+            };
+            let Some(section_decl_id) =
+                resolve_declaration_scope_declaration_id(section, declaration_scope_conj)
+            else {
+                violations.push(Diagnostic::ParseError {
+                    message: "lens enforcement: could not resolve `DeclarationScope` for timing \
+                              `EnforcedApplication` section"
+                        .to_string(),
+                    span: decl.span.clone(),
+                    fixes: Vec::new(),
+                });
+                continue;
+            };
+            let section_decl = dag.declaration(section_decl_id);
+            if !timing_section_row_type_declares_measurement_tm(dag, section_decl_id, tm_disj) {
+                violations.push(Diagnostic::ParseError {
+                    message: format!(
+                        "lens enforcement: timing `EnforcedApplication` section `{}` must be a \
+                         lowered `data …: RowTy = …` row whose nominal `RowTy` declares \
+                         `measurement: TimingMeasurement` (same substrate contract as \
+                         `timing_enforcement_project`)",
+                        section_decl.name.as_deref().unwrap_or("?")
+                    ),
+                    span: decl.span.clone(),
+                    fixes: Vec::new(),
+                });
+                continue;
             }
-        };
-        let violation_message = format!(
-            "lens enforcement violation: complexity budget {budget_class:?} exceeded \
-             by observed class {observed:?} (declared `EnforcedApplication` at {})",
-            decl.name.as_deref().unwrap_or("?")
-        );
-        violations.push(enforced_violation_diagnostic(
-            dag,
-            diagnostic_severity_disj,
-            severity_val,
-            violation_message,
-            span,
-        ));
+            let Some(body) = section_decl.value_body.as_ref() else {
+                violations.push(Diagnostic::ParseError {
+                    message: format!(
+                        "lens enforcement: timing section `{}` has no lowered value body",
+                        section_decl.name.as_deref().unwrap_or("?")
+                    ),
+                    span: decl.span.clone(),
+                    fixes: Vec::new(),
+                });
+                continue;
+            };
+            let ValueBody::Structural { fields } = body else {
+                violations.push(Diagnostic::ParseError {
+                    message: format!(
+                        "lens enforcement: timing section `{}` must lower to a structural record body",
+                        section_decl.name.as_deref().unwrap_or("?")
+                    ),
+                    span: decl.span.clone(),
+                    fixes: Vec::new(),
+                });
+                continue;
+            };
+            let section_fm = field_map(fields);
+            let Some(measurement) = section_fm.get("measurement") else {
+                violations.push(Diagnostic::ParseError {
+                    message: format!(
+                        "lens enforcement: timing section `{}` is missing required `measurement` field",
+                        section_decl.name.as_deref().unwrap_or("?")
+                    ),
+                    span: decl.span.clone(),
+                    fixes: Vec::new(),
+                });
+                continue;
+            };
+            let Some(usage_projection) =
+                timing_measurement_enforcement_usage(dag, tm_disj, measurement)
+            else {
+                violations.push(Diagnostic::ParseError {
+                    message: format!(
+                        "lens enforcement: could not interpret `measurement` as lowered \
+                         `TimingMeasurement` for section `{}`",
+                        section_decl.name.as_deref().unwrap_or("?")
+                    ),
+                    span: decl.span.clone(),
+                    fixes: Vec::new(),
+                });
+                continue;
+            };
+            let Some(declared_max_ns) = field_value_timing_budget_max_ns(budget_val) else {
+                violations.push(Diagnostic::ParseError {
+                    message: "lens enforcement: could not read timing budget `TimingBudget.max` \
+                              nanoseconds (expected `TimingBudget { max: Nanoseconds { count } }`)"
+                        .to_string(),
+                    span: decl.span.clone(),
+                    fixes: Vec::new(),
+                });
+                continue;
+            };
+            if !timing_enforcement_violates(declared_max_ns, usage_projection) {
+                continue;
+            };
+            let usage_max_ns_for_message = match usage_projection {
+                TimingMeasurementEnforcementUsage::ObservedWallNs(ns) => ns,
+                TimingMeasurementEnforcementUsage::NonObservedFault => {
+                    let Some(s) = timing_enforcement_fault_sentinel_ns_from_substrate(dag) else {
+                        violations.push(Diagnostic::ParseError {
+                            message:
+                                "lens enforcement: could not resolve substrate `timing_enforcement_fault_sentinel_count` \
+                                 from `timing_lens.dag` (needed for fault-path diagnostic text; fail-closed)"
+                                    .to_string(),
+                            span: decl.span.clone(),
+                            fixes: Vec::new(),
+                        });
+                        continue;
+                    };
+                    s
+                }
+            };
+            let severity_val = match fm.get("diagnostic_severity") {
+                Some(v) => *v,
+                _ => {
+                    violations.push(Diagnostic::ParseError {
+                        message:
+                            "lens enforcement: `EnforcedApplication` missing `diagnostic_severity`"
+                                .to_string(),
+                        span: decl.span.clone(),
+                        fixes: Vec::new(),
+                    });
+                    continue;
+                }
+            };
+            let violation_message = format!(
+                "lens enforcement violation: timing budget ceiling max_ns={declared_max_ns} exceeded \
+                 by projected wall-clock usage max_ns={usage_max_ns_for_message} (declared `EnforcedApplication` \
+                 at {})",
+                decl.name.as_deref().unwrap_or("?")
+            );
+            violations.push(enforced_violation_diagnostic(
+                dag,
+                diagnostic_severity_disj,
+                severity_val,
+                violation_message,
+                span,
+            ));
+        }
     }
 
     for diagnostic in violations {
@@ -226,6 +645,108 @@ pub(crate) fn check_enforced_lens_applications(dag: &mut Dag) {
     }
 }
 
+#[doc(hidden)]
+fn gate_58_raise_observed_duration_ns_in_measurement(
+    value: &mut FieldValue,
+    duration_ns: u64,
+) -> bool {
+    match value {
+        FieldValue::Variant { payload, .. } => {
+            let Some(FieldValue::Record(parts)) = payload.first_mut() else {
+                return false;
+            };
+            if let Some((_, FieldValue::Record(duration_parts))) =
+                parts.iter_mut().find(|(label, _)| label == "duration")
+            {
+                return gate_58_set_count_field_to_ns(duration_parts, duration_ns);
+            }
+            // PB-1 bootstrap lowering: `Observed` payload can flatten to `{ count: Nat }` without
+            // a nested `duration` record (authoring uses `Observed { duration: { count } }`).
+            gate_58_set_count_field_to_ns(parts, duration_ns)
+        }
+        _ => false,
+    }
+}
+
+fn gate_58_set_count_field_to_ns(parts: &mut [(String, FieldValue)], duration_ns: u64) -> bool {
+    for (dlabel, dfield) in parts.iter_mut() {
+        if dlabel == "count" {
+            if let FieldValue::Literal(LiteralBits::Int(s)) = dfield {
+                *s = duration_ns.to_string();
+                return true;
+            }
+            return false;
+        }
+    }
+    false
+}
+
+/// Integration receipt helper: mutates the PB-1 gate #58 witness row in a bootstrap [`Dag`].
+///
+/// **Not a supported production API** — only the `v3-compiler` integration test
+/// `t_gate_58_apply_lens_self_application_test` should call this (exposed so that test binary can
+/// link against `v3_compiler` without `cfg(test)` coupling).
+#[doc(hidden)]
+pub fn gate_58_test_raise_modeled_ci_timing_measurement_duration_ns(
+    dag: &mut Dag,
+    duration_ns: u64,
+) -> Result<(), &'static str> {
+    let id = dag
+        .declarations()
+        .iter()
+        .find(|d| {
+            d.name.as_deref() == Some("gate_58_modeled_ci_timing_measurement")
+                && d.span.file.ends_with("t_ci_workflow_as_data_demo.dag")
+        })
+        .map(|d| d.id)
+        .ok_or("missing gate_58_modeled_ci_timing_measurement declaration")?;
+    let decl = dag.declaration_mut(id);
+    let Some(ValueBody::Structural { fields }) = decl.value_body.as_mut() else {
+        return Err("gate_58 witness missing structural value_body");
+    };
+    for (label, value) in fields.iter_mut() {
+        if label == "measurement"
+            && gate_58_raise_observed_duration_ns_in_measurement(value, duration_ns)
+        {
+            return Ok(());
+        }
+    }
+    Err("measurement field missing or not Observed with duration.count shape")
+}
+
+/// Parses `(declared_max_ns, projected_usage_max_ns)` from a timing lens **budget-ceiling**
+/// violation message produced by [`check_enforced_lens_applications`].
+///
+/// The template is owned next to [`timing_enforcement_violates`] / `violation_message` formatting
+/// in this module (`max_ns=` appears exactly twice: declared ceiling, then projected usage).
+/// Integration tests use this instead of pinning English prose (see repo `TESTING.md` anti-pattern).
+#[doc(hidden)]
+pub fn gate_58_test_parse_timing_budget_violation_max_ns_pair(message: &str) -> Option<(u64, u64)> {
+    const NEEDLE: &str = "max_ns=";
+    let mut found: Vec<u64> = Vec::with_capacity(2);
+    let mut rest = message;
+    while let Some(pos) = rest.find(NEEDLE) {
+        let after = pos + NEEDLE.len();
+        let tail = &rest[after..];
+        let digit_len = tail
+            .chars()
+            .take_while(|c| c.is_ascii_digit())
+            .map(|c| c.len_utf8())
+            .sum::<usize>();
+        if digit_len == 0 {
+            return None;
+        }
+        let n: u64 = tail[..digit_len].parse().ok()?;
+        found.push(n);
+        rest = &tail[digit_len..];
+    }
+    if found.len() == 2 {
+        Some((found[0], found[1]))
+    } else {
+        None
+    }
+}
+
 fn field_map(fields: &[(String, FieldValue)]) -> HashMap<&str, &FieldValue> {
     fields.iter().map(|(k, v)| (k.as_str(), v)).collect()
 }
@@ -309,7 +830,7 @@ fn matches_enforced_application_instantiation(
                 template,
                 arguments,
             } => {
-                if *template == enforced_template && arguments.len() == 2 {
+                if *template == enforced_template && arguments.len() == 3 {
                     return true;
                 }
                 if arguments.is_empty() {
@@ -335,13 +856,10 @@ fn declaration_scope_payload_conj(
     Some(v.ty)
 }
 
-fn resolve_declaration_scope_fn(
-    dag: &Dag,
+fn resolve_declaration_scope_declaration_id(
     section: &FieldValue,
-    section_ref_disj: DeclarationId,
     declaration_scope_conj: DeclarationId,
 ) -> Option<DeclarationId> {
-    let _ = section_ref_disj;
     let FieldValue::Variant {
         constructor,
         payload,
@@ -352,8 +870,8 @@ fn resolve_declaration_scope_fn(
     if *constructor != declaration_scope_conj {
         return None;
     }
-    let id = match payload.as_slice() {
-        [FieldValue::Reference(id)] => *id,
+    match payload.as_slice() {
+        [FieldValue::Reference(id)] => Some(*id),
         [FieldValue::Record(parts)] => {
             let mut decl_id: Option<DeclarationId> = None;
             for (label, value) in parts {
@@ -363,10 +881,20 @@ fn resolve_declaration_scope_fn(
                     }
                 }
             }
-            decl_id?
+            decl_id
         }
-        _ => return None,
-    };
+        _ => None,
+    }
+}
+
+fn resolve_declaration_scope_fn(
+    dag: &Dag,
+    section: &FieldValue,
+    section_ref_disj: DeclarationId,
+    declaration_scope_conj: DeclarationId,
+) -> Option<DeclarationId> {
+    let _ = section_ref_disj;
+    let id = resolve_declaration_scope_declaration_id(section, declaration_scope_conj)?;
     matches!(dag.declaration(id).connective, TypeConnective::Arrow { .. }).then_some(id)
 }
 
@@ -660,3 +1188,71 @@ mod polynomial_budget_class_policy_tests {
         assert!(polynomial_budget_peano_is_admissible(&deg3));
     }
 }
+
+#[cfg(test)]
+mod gate_58_timing_enforcement_unit_tests {
+    use super::{
+        gate_58_test_parse_timing_budget_violation_max_ns_pair,
+        timing_enforcement_fault_sentinel_ns_from_substrate, timing_enforcement_violates,
+        TimingMeasurementEnforcementUsage,
+    };
+    use crate::dag::Dag;
+
+    #[test]
+    fn gate_58_parse_max_ns_pair_matches_timing_budget_violation_template() {
+        let msg = "lens enforcement violation: timing budget ceiling max_ns=1 exceeded \
+                 by projected wall-clock usage max_ns=999 (declared `EnforcedApplication` \
+                 at gate_58_enforcement_budget_violation)";
+        assert_eq!(
+            gate_58_test_parse_timing_budget_violation_max_ns_pair(msg),
+            Some((1, 999))
+        );
+    }
+
+    #[test]
+    fn non_observed_fault_always_violates_under_any_finite_budget() {
+        assert!(timing_enforcement_violates(
+            1,
+            TimingMeasurementEnforcementUsage::NonObservedFault
+        ));
+        assert!(timing_enforcement_violates(
+            u64::MAX - 1,
+            TimingMeasurementEnforcementUsage::NonObservedFault
+        ));
+    }
+
+    #[test]
+    fn observed_usage_strictly_exceeding_budget_violates() {
+        assert!(timing_enforcement_violates(
+            500,
+            TimingMeasurementEnforcementUsage::ObservedWallNs(1000)
+        ));
+    }
+
+    #[test]
+    fn observed_usage_within_or_equal_budget_is_clean() {
+        assert!(!timing_enforcement_violates(
+            1000,
+            TimingMeasurementEnforcementUsage::ObservedWallNs(500)
+        ));
+        assert!(!timing_enforcement_violates(
+            1000,
+            TimingMeasurementEnforcementUsage::ObservedWallNs(1000)
+        ));
+    }
+
+    #[test]
+    fn observed_wall_at_substrate_fault_sentinel_is_not_fault_short_circuit() {
+        let dag = Dag::new();
+        let s = timing_enforcement_fault_sentinel_ns_from_substrate(&dag)
+            .expect("bootstrap should carry timing_lens fault sentinel");
+        assert!(!timing_enforcement_violates(
+            s + 1,
+            TimingMeasurementEnforcementUsage::ObservedWallNs(s)
+        ));
+        assert!(timing_enforcement_violates(
+            s - 1,
+            TimingMeasurementEnforcementUsage::ObservedWallNs(s)
+        ));
+    }
+}
diff --git a/src/v3/compiler/src/lens_t_las_carrier.rs b/src/v3/compiler/src/lens_t_las_carrier.rs
index d831ba1c3e2..471841ee57a 100644
--- a/src/v3/compiler/src/lens_t_las_carrier.rs
+++ b/src/v3/compiler/src/lens_t_las_carrier.rs
@@ -38,16 +38,16 @@ pub struct Lens<T> {
     pub validate: Rc<LensValidateFn<T>>,
 }
 
-/// Mirrors `LensEnforcement<Output, Budget>` in `v3.std.lens_application`.
+/// Mirrors `LensEnforcement<Output, Budget, Projected>` in `v3.std.lens_application`.
 #[derive(Clone)]
-pub struct LensEnforcement<Output, Budget> {
-    pub project: Rc<dyn Fn(Output) -> Budget>,
-    pub violates: Rc<dyn Fn(Budget, Budget) -> bool>,
+pub struct LensEnforcement<Output, Budget, Projected> {
+    pub project: Rc<dyn Fn(Output) -> Projected>,
+    pub violates: Rc<dyn Fn(Output, Budget) -> bool>,
 }
 
-/// Mirrors `EnforceableLens<Output, Budget>` in `v3.std.lens_application`.
+/// Mirrors `EnforceableLens<Output, Budget, Projected>` in `v3.std.lens_application`.
 #[derive(Clone)]
-pub struct EnforceableLens<Output, Budget> {
+pub struct EnforceableLens<Output, Budget, Projected> {
     pub lens: Lens<Output>,
-    pub enforcement: LensEnforcement<Output, Budget>,
+    pub enforcement: LensEnforcement<Output, Budget, Projected>,
 }
diff --git a/src/v3/compiler/src/lib.rs b/src/v3/compiler/src/lib.rs
index 94c698869f6..3ac690f8ca7 100644
--- a/src/v3/compiler/src/lib.rs
+++ b/src/v3/compiler/src/lib.rs
@@ -20,6 +20,16 @@ pub mod complexity_lattice;
 pub mod dag;
 pub mod diagnostics;
 mod enforced_lens_application;
+pub use enforced_lens_application::check_enforced_lens_applications;
+// Gate #58 integration receipts (`tests/integration/t_gate_58_apply_lens_self_application_test.rs`)
+// need the helpers below as **`pub`**: the consolidated integration test binary is a separate
+// crate that links this library and cannot call `pub(crate)` items on `v3_compiler`.
+// `#[doc(hidden)]` keeps them off the supported public API; they remain unsupported for
+// out-of-tree callers (see `enforced_lens_application` module docs on each symbol).
+#[doc(hidden)]
+pub use enforced_lens_application::gate_58_test_parse_timing_budget_violation_max_ns_pair;
+#[doc(hidden)]
+pub use enforced_lens_application::gate_58_test_raise_modeled_ci_timing_measurement_duration_ns;
 pub mod integration_rs_wiring_scan;
 pub mod lens_t_las_carrier;
 pub mod pb_method_template_projection;
diff --git a/src/v3/compiler/tests/fixtures/t_gate_58_timing_enforcement_budget_violation.dag b/src/v3/compiler/tests/fixtures/t_gate_58_timing_enforcement_budget_violation.dag
new file mode 100644
index 00000000000..4ea215aedf8
--- /dev/null
+++ b/src/v3/compiler/tests/fixtures/t_gate_58_timing_enforcement_budget_violation.dag
@@ -0,0 +1,32 @@
+// Gate #58 executable receipt: `timing_enforceable` + `EnforcedApplication` host enforcement.
+//
+// `gate_58_ci_workflow_timing_row` is substrate-authoritative in
+// `t_ci_workflow_as_data_demo.dag`; this fixture pairs an over-budget `TimingMeasurement`
+// with a 1-ns ceiling so `check_enforced_lens_applications` must emit a lens-enforcement
+// diagnostic (same fail-closed path as gate #92's LAS demo, but on timing).
+module user.t_gate_58_timing_enforcement_budget_violation
+
+import v3.std.lens_application { DeclarationScope, EnforcedApplication }
+import v3.std.timing_lens {
+  TimingBudget,
+  TimingEnforcementProjected,
+  TimingMeasurement,
+  timing_enforceable
+}
+import v3.std.t_ci_workflow_as_data_demo {
+  gate_58_ci_workflow_timing_row,
+  modeled_gunbc_ci_workflow
+}
+
+data gate_58_section_over_budget: gate_58_ci_workflow_timing_row = {
+  workflow: modeled_gunbc_ci_workflow
+  measurement: Observed { duration: { count: 999 } }
+}
+
+data gate_58_enforcement_budget_violation: EnforcedApplication<TimingMeasurement, TimingBudget, TimingEnforcementProjected> = {
+  enforceable_lens: timing_enforceable
+  section: DeclarationScope { declaration: gate_58_section_over_budget }
+  budget: { max: { count: 1 } }
+  diagnostic_severity: Error
+  span: { file: "t_gate_58_timing_enforcement_budget_violation.dag", start: 0, end: 1 }
+}
diff --git a/src/v3/compiler/tests/fixtures/t_las_complexity_contract_demo.dag b/src/v3/compiler/tests/fixtures/t_las_complexity_contract_demo.dag
index c40d57be244..cc6de47e24c 100644
--- a/src/v3/compiler/tests/fixtures/t_las_complexity_contract_demo.dag
+++ b/src/v3/compiler/tests/fixtures/t_las_complexity_contract_demo.dag
@@ -14,10 +14,10 @@ import v3.std.lens_application { EnforcedApplication, DeclarationScope }
 fn linear_countdown_score(n: Int) -> Int =
   if n < 1 then 0 else linear_countdown_score(n - 1) + 1
 
-data witness_log_cap: EnforcedApplication<ComplexitySummary, AsymptoticClass> = {
+data witness_log_cap: EnforcedApplication<ComplexitySummary, AsymptoticClass, AsymptoticClass> = {
   enforceable_lens: complexity_enforceable
   section: DeclarationScope { declaration: linear_countdown_score }
   budget: ClassConstant
   diagnostic_severity: Error
-  span: { file: "t_las_complexity_contract_demo.dag", start: 805, end: 1130 }
+  span: { file: "t_las_complexity_contract_demo.dag", start: 805, end: 1147 }
 }
diff --git a/src/v3/compiler/tests/integration.rs b/src/v3/compiler/tests/integration.rs
index 9ae76b179b5..43314077a50 100644
--- a/src/v3/compiler/tests/integration.rs
+++ b/src/v3/compiler/tests/integration.rs
@@ -219,6 +219,8 @@ mod sg7_prep_variant_payload_freshness_test;
 mod shape_a_target_source_filtering_authority_test;
 #[path = "integration/t_ci_workflow_as_data_demo_test.rs"]
 mod t_ci_workflow_as_data_demo_test;
+#[path = "integration/t_gate_58_apply_lens_self_application_test.rs"]
+mod t_gate_58_apply_lens_self_application_test;
 #[path = "integration/t_impossiblebugs_unenumerated_effects_test.rs"]
 mod t_impossiblebugs_unenumerated_effects_test;
 #[path = "integration/t_las_complexity_contract_compile_error_test.rs"]
diff --git a/src/v3/compiler/tests/integration/sg0_census_test.rs b/src/v3/compiler/tests/integration/sg0_census_test.rs
index 7ee3b5a98f7..ad6c6b2fc87 100644
--- a/src/v3/compiler/tests/integration/sg0_census_test.rs
+++ b/src/v3/compiler/tests/integration/sg0_census_test.rs
@@ -688,6 +688,21 @@ const EXPECTED_HAND_AUTHORED_TEST: &[&str] = &[
     "src/v3/compiler/tests/integration/sg7_prep_variant_payload_freshness_test.rs",
     "src/v3/compiler/tests/integration/shape_a_target_source_filtering_authority_test.rs",
     "src/v3/compiler/tests/integration/t_ci_workflow_as_data_demo_test.rs",
+    // §1.8 gate #58 (`apply_lens_self_application_demonstrated`): Rust integration asserts the
+    // PB-1 `generated_full_bootstrap_dag()` snapshot carries the std witness + zero bootstrap
+    // diagnostics (timing `EnforcedApplication` row in `t_ci_workflow_as_data_demo.dag`).
+    //
+    // **P5 receipt (INVARIANTS.md §P5 per-PR gate — SG-0 `EXPECTED_HAND_AUTHORED_TEST`):**
+    // explicit deferral to **ROADMAP.md** `### Nine lanes` row **T-PB-B** /
+    // `pb_rust_tests_outside_residual_zero` (tests-as-data / Pure Bootstrap test floor), same
+    // structural class as co-listed `t_ci_workflow_as_data_demo_test.rs` and
+    // `t_las_complexity_contract_compile_error_test.rs`: the obligation is still discharged via a
+    // hand-maintained Rust harness until the generic `.dag` `TestClaim` runner can assert the same
+    // bootstrap facts without this file. Lane context: **T-Lens-Self-Application** /
+    // `apply_lens_self_application_demonstrated` (`docs/r3-structure.md`, `docs/r3-program-plan.md`
+    // §1.8 gate #58). Dissolution: delete this path from the census when the receipt ports to a
+    // `.dag` TestClaim (or a generated test) with no remaining SG-0 hand-authored test delta.
+    "src/v3/compiler/tests/integration/t_gate_58_apply_lens_self_application_test.rs",
     "src/v3/compiler/tests/integration/t_impossiblebugs_unenumerated_effects_test.rs",
     "src/v3/compiler/tests/integration/t_las_complexity_contract_compile_error_test.rs",
     "src/v3/compiler/tests/integration/t_las_crdt_cost_basis_demo_test.rs",
diff --git a/src/v3/compiler/tests/integration/t_gate_58_apply_lens_self_application_test.rs b/src/v3/compiler/tests/integration/t_gate_58_apply_lens_self_application_test.rs
new file mode 100644
index 00000000000..4f5c6b906cc
--- /dev/null
+++ b/src/v3/compiler/tests/integration/t_gate_58_apply_lens_self_application_test.rs
@@ -0,0 +1,153 @@
+//! **Layer:** integration
+//!
+//! §1.8 / gate #58 `apply_lens_self_application_demonstrated`: `EnforcedApplication` with
+//! `timing_enforceable` on modeled CI `Workflow` data (`timing_lens.dag` + host consumer in
+//! `enforced_lens_application.rs`).
+//!
+//! The pass witness is authored in `src/v3/std/t_ci_workflow_as_data_demo.dag` (typed section
+//! witness `gate_58_modeled_ci_timing_measurement` + `gate_58_apply_lens_self_application_pass`) and
+//! is compiled into the committed PB-1 bootstrap snapshot. Fail-closed budget arithmetic is
+//! unit-tested in `enforced_lens_application.rs`.
+
+use std::fs;
+use std::path::PathBuf;
+
+use crate::common::cached_compile_outcome;
+use crate::common::CachedCompileOutcome;
+
+use v3_compiler::{
+    check_enforced_lens_applications, gate_58_test_parse_timing_budget_violation_max_ns_pair,
+    gate_58_test_raise_modeled_ci_timing_measurement_duration_ns, generated_full_bootstrap_dag,
+    Diagnostic,
+};
+
+const VIOLATION_FIXTURE_REL: &str =
+    "src/v3/compiler/tests/fixtures/t_gate_58_timing_enforcement_budget_violation.dag";
+const VIOLATION_FILE_NAME: &str = "t_gate_58_timing_enforcement_budget_violation.dag";
+
+#[test]
+fn apply_lens_self_application_demonstrated_bootstrap_receipt() {
+    let mut dag = generated_full_bootstrap_dag();
+    assert!(
+        dag.declaration_by_name("gate_58_apply_lens_self_application_pass")
+            .is_some(),
+        "bootstrap must include gate #58 timing `EnforcedApplication` pass witness (`gate_58_apply_lens_self_application_pass`)"
+    );
+    assert!(
+        dag.declaration_by_name("modeled_gunbc_ci_workflow")
+            .is_some(),
+        "bootstrap must include modeled CI `Workflow` (`modeled_gunbc_ci_workflow`)"
+    );
+    assert!(
+        dag.declaration_by_name("timing_enforceable").is_some(),
+        "bootstrap must include `timing_enforceable` (`timing_lens.dag`)"
+    );
+    assert!(
+        dag.declaration_by_name("gate_58_modeled_ci_timing_measurement")
+            .is_some(),
+        "bootstrap must include gate #58 timing witness row"
+    );
+    assert!(
+        dag.diagnostics().is_empty(),
+        "unexpected bootstrap diagnostics: {:?}",
+        dag.diagnostics()
+    );
+
+    check_enforced_lens_applications(&mut dag);
+    assert!(
+        dag.diagnostics().is_empty(),
+        "post-infer timing `EnforcedApplication` check must stay clean on the gate #58 pass witness; got {:?}",
+        dag.diagnostics()
+    );
+
+    // Executable receipt (INVARIANTS P3 / gate #58): perturb the lowered witness above the pass
+    // budget and prove [`check_enforced_lens_applications`] evaluates timing enforcement on the
+    // live bootstrap graph (not merely declaration presence + a no-op pass).
+    const PASS_BUDGET_MAX_NS: u64 = 1_000_000_000;
+    const OVER_BUDGET_NS: u64 = PASS_BUDGET_MAX_NS + 1;
+    gate_58_test_raise_modeled_ci_timing_measurement_duration_ns(&mut dag, OVER_BUDGET_NS)
+        .expect("raise gate #58 modeled timing measurement over pass budget");
+    check_enforced_lens_applications(&mut dag);
+    assert_eq!(
+        dag.diagnostics().len(),
+        1,
+        "expected exactly one timing budget violation diagnostic after witness perturbation; got {:?}",
+        dag.diagnostics()
+    );
+    let (_, d) = dag.diagnostics().iter().next().expect("one diagnostic");
+    assert_eq!(
+        d.layer1_kind_label(),
+        "ParseError",
+        "timing budget enforcement must route through EnforcedApplication ParseError; got {d:?}"
+    );
+    let Diagnostic::ParseError {
+        message,
+        span,
+        fixes,
+    } = d
+    else {
+        panic!("expected ParseError diagnostic, got {d:?}");
+    };
+    assert!(
+        fixes.is_empty(),
+        "timing budget violation must not attach auto-fixes; got {fixes:?}"
+    );
+    assert!(
+        span.file.ends_with("t_ci_workflow_as_data_demo.dag"),
+        "violation must anchor to the gate #58 std witness file; got span={span:?}"
+    );
+    let (declared, projected) = gate_58_test_parse_timing_budget_violation_max_ns_pair(message)
+        .unwrap_or_else(|| {
+            panic!(
+                "timing budget violation message must expose two max_ns= fields (see enforced_lens_application); got {message:?}"
+            )
+        });
+    assert_eq!(
+        declared, PASS_BUDGET_MAX_NS,
+        "declared ceiling ns mismatch (structured parse)"
+    );
+    assert_eq!(
+        projected, OVER_BUDGET_NS,
+        "projected usage ns mismatch (structured parse)"
+    );
+}
+
+#[test]
+fn apply_lens_self_application_timing_enforcement_executable_budget_violation() {
+    let path = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+        .join("../../..")
+        .join(VIOLATION_FIXTURE_REL);
+    let source =
+        fs::read_to_string(&path).expect("read gate #58 timing enforcement violation fixture");
+    std::thread::Builder::new()
+        .name("t-gate-58-timing-enforcement-violation".into())
+        .stack_size(64 * 1024 * 1024)
+        .spawn(move || {
+            let CachedCompileOutcome::Semantic(dag) =
+                cached_compile_outcome(&source, VIOLATION_FILE_NAME)
+            else {
+                panic!(
+                    "fixture must fail closed with semantic diagnostics (timing budget exceeded)"
+                );
+            };
+            let diags: Vec<&Diagnostic> = dag.diagnostics().iter().map(|(_, d)| d).collect();
+            let ok = diags.iter().any(|d| {
+                d.layer1_kind_label() == "ParseError"
+                    && matches!(d, Diagnostic::ParseError { fixes, .. } if fixes.is_empty())
+                    && match d {
+                        Diagnostic::ParseError { message, .. } => {
+                            gate_58_test_parse_timing_budget_violation_max_ns_pair(message)
+                                == Some((1, 999))
+                        }
+                        _ => false,
+                    }
+            });
+            assert!(
+                ok,
+                "expected timing lens enforcement ParseError (declared=1ns, observed=999ns); got {diags:?}"
+            );
+        })
+        .expect("spawn gate #58 enforcement compile")
+        .join()
+        .expect("gate #58 enforcement compile thread panicked");
+}
diff --git a/src/v3/lenses/complexity.dag b/src/v3/lenses/complexity.dag
index 348ef0bf0ea..4891b5bb361 100644
--- a/src/v3/lenses/complexity.dag
+++ b/src/v3/lenses/complexity.dag
@@ -483,9 +483,9 @@ fn complexity_enforcement_project(summary: ComplexitySummary) -> AsymptoticClass
 // so stored `asymptotic_class` stays comparable to classified work under the same lattice.
 // **Budget enforcement** must follow this named bridge (single consumer:
 // `enforced_lens_application`); do not conflate it with substrate `meet`/`join` alone.
-fn complexity_enforcement_violates(declared: AsymptoticClass, observed: AsymptoticClass) -> Bool =
-  if asymptotic_dominates(observed, declared) then
-    if asymptotic_dominates(declared, observed) then 0 == 1 else 0 == 0
+fn complexity_enforcement_violates(summary: ComplexitySummary, declared: AsymptoticClass) -> Bool =
+  if asymptotic_dominates(summary.asymptotic_class, declared) then
+    if asymptotic_dominates(declared, summary.asymptotic_class) then 0 == 1 else 0 == 0
   else
     0 == 1
 
@@ -568,17 +568,18 @@ data complexity_lens: Lens<ComplexitySummary> = {
   validate: complexity_lens_validate
 }
 
-data complexity_enforcement: LensEnforcement<ComplexitySummary, AsymptoticClass> = {
+data complexity_enforcement: LensEnforcement<ComplexitySummary, AsymptoticClass, AsymptoticClass> = {
   project: complexity_enforcement_project
   violates: complexity_enforcement_violates
 }
 
-data complexity_enforceable: EnforceableLens<ComplexitySummary, AsymptoticClass> = {
+data complexity_enforceable: EnforceableLens<ComplexitySummary, AsymptoticClass, AsymptoticClass> = {
   lens: complexity_lens
   enforcement: complexity_enforcement
 }
 
-type ComplexityEnforcedApplication = EnforcedApplication<ComplexitySummary, AsymptoticClass>
+type ComplexityEnforcedApplication =
+  EnforcedApplication<ComplexitySummary, AsymptoticClass, AsymptoticClass>
 
 // CostBound projection authority lives in `std.induction::cost_bound_to_symbolic`.
 // This lens consumes the live CallPattern query directly because structural
diff --git a/src/v3/spec/rust.dag b/src/v3/spec/rust.dag
index cf9b0bc89e1..d6564ee47e6 100644
--- a/src/v3/spec/rust.dag
+++ b/src/v3/spec/rust.dag
@@ -1325,14 +1325,14 @@ data rust_monoid_instantiation: TypeInstantiationRealization = {
 data rust_lens_enforcement_instantiation: TypeInstantiationRealization = {
   language: rust_language
   target: LensEnforcement
-  carrier: "LensEnforcement<{key}, {value}>"
+  carrier: "LensEnforcement<{key}, {value}, {extra}>"
   cost: 1
 }
 
 data rust_enforceable_lens_instantiation: TypeInstantiationRealization = {
   language: rust_language
   target: EnforceableLens
-  carrier: "EnforceableLens<{key}, {value}>"
+  carrier: "EnforceableLens<{key}, {value}, {extra}>"
   cost: 1
 }
 
diff --git a/src/v3/std/bootstrap_authority.dag b/src/v3/std/bootstrap_authority.dag
index 5014be6654a..7980e5a84a2 100644
--- a/src/v3/std/bootstrap_authority.dag
+++ b/src/v3/std/bootstrap_authority.dag
@@ -81,8 +81,8 @@ data bootstrap_authority: BootstrapAuthoritySet = {
     "src/v3/std/substrate.dag": V3StdAuthority,
     "src/v3/std/substrate_minimal.dag": V3StdAuthority,
     "src/v3/std/termination.dag": V3StdAuthority,
-    "src/v3/std/t_ci_workflow_as_data_demo.dag": V3StdAuthority,
     "src/v3/std/timing_lens.dag": V3StdAuthority,
+    "src/v3/std/t_ci_workflow_as_data_demo.dag": V3StdAuthority,
     "src/v3/std/tokenize.dag": V3StdAuthority,
     "src/v3/std/verification.dag": V3StdAuthority,
     "src/v3/std/workflows.dag": V3StdAuthority,
diff --git a/src/v3/std/lens_application.dag b/src/v3/std/lens_application.dag
index 968aa84a1fa..0536c3de073 100644
--- a/src/v3/std/lens_application.dag
+++ b/src/v3/std/lens_application.dag
@@ -20,14 +20,17 @@
 // issue. "SectionedLensApplication" is a collective noun for the pair;
 // it is NOT a substrate declaration.
 //
-// Why the per-lens `LensEnforcement<Output, Budget>` projection rather
-// than `Output = Budget` everywhere: complexity's lens-output is rich
+// Why the per-lens `LensEnforcement<Output, Budget, Projected>` projection
+// rather than `Output = Budget` everywhere: complexity's lens-output is rich
 // (`ComplexitySummary { work, span, asymptotic_class, ... }`) — required
 // for compositional folds — but the user-authored budget is typically a
 // single class (`O_log_n`). The projection separates the two: lens
 // output stays rich (load-bearing for composition); budget stays simple
 // (load-bearing for user authoring). Lenses where Output = Budget (cost,
-// parallelism) declare the identity projection.
+// parallelism) declare the identity projection with `Projected = Budget`.
+// Timing enforcement uses a `Projected` sum distinct from `TimingBudget`
+// so non-evidence reports are not encoded as plausible nanosecond magnitudes
+// on the projection boundary (P2 / gate #58; see `timing_lens.dag`).
 //
 // Per-lens `LensEnforcement` and `EnforceableLens` data declarations
 // land alongside each lens (`src/v3/lenses/complexity.dag`, etc.) in
@@ -83,21 +86,23 @@ type DiagnosticSeverity = Error
 // 🟢 TERMINAL at the per-lens projection scope. The two fields are the
 // irreducible contract a per-lens enforcement must publish:
 //
-//   - `project`  — extracts the budget-comparable coordinate from the
-//                  lens output. Identity for lenses where Output = Budget
-//                  (cost, parallelism); for complexity, projects
-//                  `ComplexitySummary -> AsymptoticClass`.
-//   - `violates` — per-lens violation relation. Returns true iff the
-//                  observed (projected) value EXCEEDS the user's
-//                  declared budget under the lens's own ordering
-//                  (lattice dominance for complexity; cost dominance
-//                  for cost; mode-mismatch for parallelism). The
-//                  projection alone would leave "did observed exceed
-//                  declared?" as API-level convention; the relation
-//                  field makes it substrate authority.
-type LensEnforcement<Output, Budget> {
-  project: fn(Output) -> Budget
-  violates: fn(Budget, Budget) -> Bool
+//   - `project`  — extracts the **usage / comparable projection** from the
+//                  lens output (may equal `Budget` — complexity, cost — or be
+//                  a dedicated sum — timing `TimingEnforcementProjected`).
+//   - `violates` — per-lens violation relation. First argument is the
+//                  **full lens output** `Output` (not only `project(o)`):
+//                  relations that must distinguish sum variants before
+//                  comparing budget-shaped coordinates (timing gate #58:
+//                  `Observed` wall ns vs non-evidence) cannot be expressed
+//                  as pure `Budget × Budget` predicates without illegal-state
+//                  collisions (see `timing_lens.dag`). Second argument is the
+//                  user-declared `Budget`. Returns true iff enforcement fails
+//                  closed under the lens ordering (lattice dominance for
+//                  complexity; strict `>` on nanoseconds for timing observed
+//                  evidence; etc.).
+type LensEnforcement<Output, Budget, Projected> {
+  project: fn(Output) -> Projected
+  violates: fn(Output, Budget) -> Bool
 }
 
 // 🟢 TERMINAL at the per-lens canonical-pairing scope. Bundles a lens
@@ -134,9 +139,9 @@ type LensEnforcement<Output, Budget> {
 // `EnforceableLens<C, B>`) would require existentials or singleton
 // inhabitance — substrate features v3 does not currently express.
 // Future substrate hardening lifts this to type-level.
-type EnforceableLens<Output, Budget> {
+type EnforceableLens<Output, Budget, Projected> {
   lens: Lens<Output>
-  enforcement: LensEnforcement<Output, Budget>
+  enforcement: LensEnforcement<Output, Budget, Projected>
 }
 
 // 🟢 TERMINAL at the enforce-mode application scope. Carrier for
@@ -148,10 +153,11 @@ type EnforceableLens<Output, Budget> {
 // principles 2/6: Enforce-without-budget / Introspect-with-budget /
 // Introspect-with-enforcement / lens-projection-budget mismatch are
 // all illegal states; all unrepresentable in this carrier shape. The
-// shared `Output` and `Budget` type parameters tie
+// shared `Output`, `Budget`, and `Projected` type parameters tie
 // `enforceable_lens.lens` (`Lens<Output>`),
-// `enforceable_lens.enforcement` (`LensEnforcement<Output, Budget>`),
-// and `budget` (`Budget`) structurally. Mismatched triples are
+// `enforceable_lens.enforcement` (`LensEnforcement<Output, Budget, Projected>`),
+// `budget` (`Budget`), and the enforcement `project` codomain (`Projected`)
+// structurally. Mismatched instantiations are
 // rejected at parse/inference time, not via a separate type-checker
 // rule.
 //
@@ -167,8 +173,8 @@ type EnforceableLens<Output, Budget> {
 //                              attribution. Required (not Optional) —
 //                              every Enforce application has an
 //                              authoring site.
-type EnforcedApplication<Output, Budget> {
-  enforceable_lens: EnforceableLens<Output, Budget>
+type EnforcedApplication<Output, Budget, Projected> {
+  enforceable_lens: EnforceableLens<Output, Budget, Projected>
   section: SectionRef
   budget: Budget
   diagnostic_severity: DiagnosticSeverity
diff --git a/src/v3/std/t_ci_workflow_as_data_demo.dag b/src/v3/std/t_ci_workflow_as_data_demo.dag
index 46b53dc6877..d9c4f7bd9d9 100644
--- a/src/v3/std/t_ci_workflow_as_data_demo.dag
+++ b/src/v3/std/t_ci_workflow_as_data_demo.dag
@@ -22,8 +22,12 @@ import extdeps.github.actions {
 }
 import v3.std.dimensions { Witness, OptionalDiagnostic, DimensionReport }
 import v3.std.diagnostics { Diagnostic }
+import v3.std.lens_application { DeclarationScope, DiagnosticSeverity, EnforcedApplication }
 import v3.std.timing_lens {
+  TimingBudget,
+  TimingEnforcementProjected,
   TimingMeasurement,
+  timing_enforceable,
   timing_lens_behavior_span,
   timing_lens_scaffold_non_evidence_diagnostic,
   timing_lens_validate,
@@ -208,3 +212,38 @@ fn demo_ci_modeled_timing_dimension_report(d: Dag, b: Behavior) -> DimensionRepo
     dimension_report_tm_from_witness(d, ci_demo_timing_read(d, b))
   else
     dimension_report_tm_from_witness(d, ci_wad_modeled_workflow_timing_witness(d, b))
+
+// Gate #58 (`apply_lens_self_application_demonstrated`) — `apply_lens(timing, ci_workflow, Enforce)`
+// per `docs/r3-structure.md` §7 / `docs/r3-program-plan.md` §1.8: the **modeled CI workflow** is
+// `data modeled_gunbc_ci_workflow: Workflow` above; host `check_enforced_lens_applications` only
+// accepts a `DeclarationScope` subject whose **nominal row type** declares `measurement:
+// TimingMeasurement` (`enforced_lens_application.rs` — same contract as gate #92’s LAS row).
+// This row is therefore the workflow **plus** the timing column: `workflow` is exactly that
+// `Workflow` value (not a paraphrase), and `measurement` is the lowered timing witness the
+// consumer reads. **Dissolution:** observation-backed `TimingMeasurement` for real CI anchors, or
+// a substrate path that enforces directly against `Workflow` without the conj shim — tracked under
+// T-Lens-Self-Application / `INVARIANTS.md` SG-0 / ROADMAP T-PB-B.
+//
+// `Observed { duration: { count: 0 } }` is a **PB-1 lowered receipt** for the harness (not live
+// `TimingObservationEntry` wiring). The integration test perturbs `measurement` to prove host
+// enforcement runs on the bootstrap snapshot.
+type gate_58_ci_workflow_timing_row {
+  workflow: Workflow
+  measurement: TimingMeasurement
+}
+
+data gate_58_modeled_ci_timing_measurement: gate_58_ci_workflow_timing_row = {
+  workflow: modeled_gunbc_ci_workflow
+  measurement: Observed { duration: { count: 0 } }
+}
+
+// Gate #58 pass witness: same `EnforcedApplication<…, TimingEnforcementProjected>` carrier as
+// gate #92; `section` binds the gate #58 row above so enforcement applies to the modeled CI
+// workflow instance carried in `workflow` alongside `measurement`.
+data gate_58_apply_lens_self_application_pass: EnforcedApplication<TimingMeasurement, TimingBudget, TimingEnforcementProjected> = {
+  enforceable_lens: timing_enforceable
+  section: DeclarationScope { declaration: gate_58_modeled_ci_timing_measurement }
+  budget: { max: { count: 1000000000 } }
+  diagnostic_severity: Error
+  span: { file: "src/v3/std/t_ci_workflow_as_data_demo.dag", start: 0, end: 0 }
+}
diff --git a/src/v3/std/timing_lens.dag b/src/v3/std/timing_lens.dag
index 85455dd3dfb..9de9d41c80a 100644
--- a/src/v3/std/timing_lens.dag
+++ b/src/v3/std/timing_lens.dag
@@ -11,6 +11,7 @@
 // durations) and passes `Unobserved` / `Ambiguous` / `Stale` through unchanged.
 module v3.std.timing_lens
 
+import std.algebra { Monoid }
 import std.list { List, is_empty }
 import std.nat { Nat }
 import std.types {
@@ -27,6 +28,7 @@ import std.substrate { Dag, Behavior, LoopBound, NodeId }
 import v3.std.diagnostics { Diagnostic, CompilerDiagnosticKind, Correction }
 import v3.std.dimensions { Witness, OptionalDiagnostic }
 import v3.std.lens { Lens }
+import v3.std.lens_application { LensEnforcement, EnforceableLens }
 import v3.std.workflows { behavior_spine }
 
 // DB-11 `FilePath` witness for this module (same narrowing discipline as
@@ -157,6 +159,24 @@ type TimingBudget {
   max: Nanoseconds
 }
 
+// T-LAS timing enforcement: `project` codomain for `LensEnforcement<TimingMeasurement,
+// TimingBudget, TimingEnforcementProjected>`. Separates observed wall-clock usage (`TimedUsage`)
+// from non-evidence report states (`NonEvidenceUsage`) so `project` never encodes the latter as a
+// plausible `Nat` magnitude inside `TimingBudget` (P2 / illegal-states-unrepresentable; openai-pro
+// review on gate #58).
+//
+// PRACTICE 4 / INVARIANTS P1 (`docs/modeling-discipline.md` §4 coproduct checkpoint) — traffic light:
+// **🟢 GREEN (terminal)** — landed enforcement-projection coproduct: `TimedUsage` is the observed
+// wall-clock usage coordinate (same `Nanoseconds` shape as `TimingBudget.max`); `NonEvidenceUsage`
+// is a unit fact for `Unobserved` / `Ambiguous` / `Stale` (no `Nat` fault sentinel in `TimingBudget`).
+// **🟡 SCAFFOLD** — none on this sum (both variants are substrate-final at this layer). **🔴 BLOCKED**
+// — none. **Dissolution:** retire this sum only when every `project` consumer can thread full
+// `TimingMeasurement` without illegal-state collisions (gate #58 `.dag` `TestClaim` / T-PB-B SG-0
+// receipt per `INVARIANTS.md`).
+type TimingEnforcementProjected
+  = TimedUsage { max: Nanoseconds }
+  | NonEvidenceUsage
+
 // §1.8 / r3-program-plan `timing_lens_carrier_landed`: nominal `Lens<C>` surface at
 // `C = TimingMeasurement` (see `docs/design-timing-lens.md` §1). Hooks below remain
 // scaffold until `data … : TimingLens` rows are admissible under E6-G1 policy.
@@ -341,3 +361,63 @@ fn timing_lens_validate(d: Dag, composed: TimingMeasurement) -> OptionalDiagnost
         "timing_lens_validate: TimingMeasurement.Stale is not admissible evidence at this scaffold (digest/run mismatch vs attachment)."
       )
   }
+
+// ── T-LAS / T-Lens-Self-Application — gate #58 `apply_lens_self_application_demonstrated` ──
+//
+// Canonical `EnforceableLens` for timing contracts on workflow-shaped sections. Enforcement
+// fail-closes on `Unobserved` / `Ambiguous` / `Stale` (typed `NonEvidenceUsage` projection) and on
+// `Observed` durations strictly above the user `TimingBudget.max` ceiling (same reflexive edge as
+// gate #94 memory-peak: `>` not `>=`). Host consumer: `enforced_lens_application` (mirrors
+// `complexity_enforceable` wiring for gate #92).
+//
+// P2: `violates` takes the full `TimingMeasurement` (see `LensEnforcement` in
+// `lens_application.dag`) so non-evidence variants fail closed without comparing sentinels inside
+// `TimingBudget`. `project` returns `TimingEnforcementProjected` — never overloads
+// `TimingBudget.max.count` with a second meaning for faults (codex 10994 / openai-pro gate #58).
+//
+// `timing_enforcement_fault_sentinel_count` remains a substrate-named regression literal (unit
+// tests: observed wall ns equal to this magnitude is ordinary evidence, not a fault short-circuit).
+
+fn timing_enforcement_fault_sentinel_count() -> Nat =
+  999999999999999999
+
+fn timing_enforcement_project(m: TimingMeasurement) -> TimingEnforcementProjected =
+  match m {
+    Observed { duration: d } => TimedUsage { max: d }
+    Unobserved => NonEvidenceUsage
+    Ambiguous => NonEvidenceUsage
+    Stale => NonEvidenceUsage
+  }
+
+fn timing_enforcement_violates(m: TimingMeasurement, declared: TimingBudget) -> Bool =
+  match m {
+    Observed { duration: d } =>
+      if d.count > declared.max.count then 0 == 0 else 0 == 1
+    Unobserved => 0 == 0
+    Ambiguous => 0 == 0
+    Stale => 0 == 0
+  }
+
+data timing_lens_monoid: Monoid<TimingMeasurement> = {
+  op: timing_sequential_op
+  identity: Observed { duration: { count: 0 } }
+}
+
+data timing_lens: TimingLens = {
+  name: "timing"
+  read: timing_lens_read
+  sequential: timing_lens_monoid
+  branch: timing_branch_op
+  iterate: timing_measurement_iterate
+  validate: timing_lens_validate
+}
+
+data timing_enforcement: LensEnforcement<TimingMeasurement, TimingBudget, TimingEnforcementProjected> = {
+  project: timing_enforcement_project
+  violates: timing_enforcement_violates
+}
+
+data timing_enforceable: EnforceableLens<TimingMeasurement, TimingBudget, TimingEnforcementProjected> = {
+  lens: timing_lens
+  enforcement: timing_enforcement
+}